From: Mikal Kolbein Gule <m.k.gule@usit.uio.no>
Date: Tue, 3 Jul 2012 09:42:05 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: http://git.uio.no/git/?a=commitdiff_plain;h=abae0925068765eab9949911449f0bb50d3372d7;p=usit-rt.git

Merge branch 'dev'
---

abae0925068765eab9949911449f0bb50d3372d7