Merge branch 'dev' of git.uio.no:usit-rt into dev
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:26:01 +0000 (17:26 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:26:01 +0000 (17:26 +0200)

Trivial merge