Merge branch 'master' of git.uio.no:u/erikhf/frm
authorYrjan A. F. Fraschetti <yrjanaff@1x-193-157-250-45.uio.no>
Thu, 10 Dec 2015 18:33:36 +0000 (19:33 +0100)
committerYrjan A. F. Fraschetti <yrjanaff@1x-193-157-250-45.uio.no>
Thu, 10 Dec 2015 18:33:36 +0000 (19:33 +0100)

Trivial merge