Merge branch 'dev' of git.uio.no:usit-rt into dev
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:26:01 +0000 (17:26 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Thu, 23 May 2013 15:26:01 +0000 (17:26 +0200)
commit741c1d2928e9fc176a2479d8deda8a61d5b7f48f
tree778bc2138387cfee3fcb024bddff38049eca80a5
parent3de606e0eaa9b917932a863d275f0834b630ca02
parent9911114f1f90ad72a0a8796d4b7987a64ccfe8be
Merge branch 'dev' of git.uio.no:usit-rt into dev