Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 10 Jul 2012 08:48:46 +0000 (10:48 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 10 Jul 2012 08:48:46 +0000 (10:48 +0200)

Trivial merge