Merge "fixed resetting states with parallel Verlet scheme" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Sun, 13 Jan 2013 23:42:36 +0000 (00:42 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 13 Jan 2013 23:42:36 +0000 (00:42 +0100)

Trivial merge