Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 2 Oct 2014 21:37:20 +0000 (23:37 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 2 Oct 2014 21:37:20 +0000 (23:37 +0200)

Trivial merge