Merge "Fixed bug in free energy calculation for Morse potentials" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Wed, 4 Jul 2012 05:16:56 +0000 (07:16 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 4 Jul 2012 05:16:56 +0000 (07:16 +0200)

Trivial merge