Merge branch 'master' of git.uio.no:u/erikhf/frm
authorRoza Moustafa <roza.92m@hotmail.com>
Thu, 10 Dec 2015 16:51:24 +0000 (17:51 +0100)
committerRoza Moustafa <roza.92m@hotmail.com>
Thu, 10 Dec 2015 16:51:24 +0000 (17:51 +0100)

Trivial merge