Merge branch 'master' of git.uio.no:usit-rt master
authorMarcus Ramberg <marcus.ramberg@gmail.com>
Tue, 16 Dec 2014 14:25:52 +0000 (15:25 +0100)
committerMarcus Ramberg <marcus.ramberg@gmail.com>
Tue, 16 Dec 2014 14:25:52 +0000 (15:25 +0100)

Trivial merge