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)

Trivial merge