From: Mikal Kolbein Gule <m.k.gule@usit.uio.no>
Date: Thu, 23 May 2013 15:26:01 +0000 (+0200)
Subject: Merge branch 'dev' of git.uio.no:usit-rt into dev
X-Git-Url: http://git.uio.no/git/?p=usit-rt.git;a=commitdiff_plain;h=741c1d2928e9fc176a2479d8deda8a61d5b7f48f

Merge branch 'dev' of git.uio.no:usit-rt into dev
---

741c1d2928e9fc176a2479d8deda8a61d5b7f48f