Merge "Fixes for expanded ensemble and HREPEX" into release-4-6
authorErik Lindahl <erik@kth.se>
Thu, 20 Dec 2012 22:25:59 +0000 (23:25 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 20 Dec 2012 22:25:59 +0000 (23:25 +0100)

Trivial merge