Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 6 Oct 2014 22:57:45 +0000 (00:57 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 6 Oct 2014 22:57:45 +0000 (00:57 +0200)

Trivial merge