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)
commit3a78356ed512e48e6d1a4e1d797264e35a472494
tree2e4cd1518b55a005967b14d506ebb5d83b84a5a3
parent5fc0d5f7a929dd3699ec072e07767f16c8d4d169
parent2d967a12c6de0551ac8c18a3ad8179da3d074fa7
Merge branch 'dev'