]> git.uio.no Git - u/erikhf/frm.git/commitdiff
git://git.uio.no / u / erikhf / frm.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 973db7a 30593bb)
merge!
authorYrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Sun, 22 Nov 2015 21:24:45 +0000 (22:24 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@MacBook-Pro.local>
Sun, 22 Nov 2015 21:24:45 +0000 (22:24 +0100)

Trivial merge