Merge branch 'dev' 4.0.6
authorMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 18 Jun 2012 12:48:05 +0000 (14:48 +0200)
committerMikal Kolbein Gule <m.k.gule@usit.uio.no>
Mon, 18 Jun 2012 12:48:05 +0000 (14:48 +0200)
commitd96a0c7ec08cc851ba9f6bddbfe2d194e614bdd6
tree5d7b298b39adbb4cb756b85be16bc491e0c7b7be
parent35ef43cf382dbbdaeeeb9a33484873f893e00a51
parentb5747ff2520f421155a12155049117a9a2a67fe5
Merge branch 'dev'