Merge branch 'master' of git.uio.no:usit-rt
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 8 Jan 2013 12:40:52 +0000 (13:40 +0100)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 8 Jan 2013 12:40:52 +0000 (13:40 +0100)

Trivial merge