Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 16 Jul 2012 11:57:01 +0000 (13:57 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 16 Jul 2012 11:57:01 +0000 (13:57 +0200)

Trivial merge