Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 22 Apr 2013 07:27:36 +0000 (09:27 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 22 Apr 2013 07:27:36 +0000 (09:27 +0200)

Trivial merge