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)
commitefe7622a69337abbae0cde7e5650d37bcf511052
treec0d903efaa900c1d52daeab90b8ae2ccd5e50e9e
parentdc2e2671647cbeb90beae98e18749cf40d5e2171
parentea78ec83d19abaf35b0509238386719d48b8c380
Merge "Fixes for expanded ensemble and HREPEX" into release-4-6