Merge "fixing rerun with free energy + .xtc or .gro" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 10 May 2013 09:45:08 +0000 (11:45 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 10 May 2013 09:45:08 +0000 (11:45 +0200)

Trivial merge