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)
commit5fc0d5f7a929dd3699ec072e07767f16c8d4d169
tree7371550557b8260c457894d7743ef61c09cdc955
parentc33a4027369d767810c2d24ad54d6e61599ff823
parent3ffc5f4f234c1fc3f44b0ef26e777aab6de13e05
Merge branch 'dev'