From: Mikal Kolbein Gule <m.k.gule@usit.uio.no>
Date: Mon, 18 Jun 2012 12:48:05 +0000 (+0200)
Subject: Merge branch 'dev'
X-Git-Url: http://git.uio.no/git/?p=usit-rt.git;a=commitdiff_plain;h=d96a0c7ec08cc851ba9f6bddbfe2d194e614bdd6

Merge branch 'dev'
---

d96a0c7ec08cc851ba9f6bddbfe2d194e614bdd6