Merge branch 'dev'
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 16 Jul 2012 11:57:01 +0000 (13:57 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 16 Jul 2012 11:57:01 +0000 (13:57 +0200)
commitf869933810b7c94b2638229a95860efeb5148803
tree69a1233a06fe4ae989af11b5d13d783bf0ca9a09
parent00000e583992100214f1015eb493d63dce67d8df
parentd7b8a71d22bac9f1e6b6c9911e434e80237d1a84
Merge branch 'dev'