Merge release-5-0 into master
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 17 Sep 2014 14:43:01 +0000 (16:43 +0200)
committerDavid van der Spoel <spoel@xray.bmc.uu.se>
Wed, 17 Sep 2014 15:38:07 +0000 (17:38 +0200)
Change-Id: I862e73932dea368b5bac883eb1bf5725314efd2d


No differences found