Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 26 Jun 2012 08:07:05 +0000 (10:07 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 26 Jun 2012 08:07:05 +0000 (10:07 +0200)
commitf89d4f3956583464551afc70f5e631ad015be4e8
treeee6f0ce06ad239157414729c16b3fd5d264c1a85
parentd96a0c7ec08cc851ba9f6bddbfe2d194e614bdd6
parent78afc2cf9e1216fbc4f97ad36a4bb2009c46c459
Merge branch 'dev'