Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 10 Jul 2012 08:48:46 +0000 (10:48 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Tue, 10 Jul 2012 08:48:46 +0000 (10:48 +0200)
commit00000e583992100214f1015eb493d63dce67d8df
treef2015d479d3d843ac32fbc0267c336a8a59ba69e
parentabae0925068765eab9949911449f0bb50d3372d7
parent8349b8eb2c19cee2551da8979cc861c3ad8fd06c
Merge branch 'dev'