Merge "Continuation of documentation for expanded ensemble." into release-4-6
authorSander Pronk <sndr.sndr@gmail.com>
Tue, 15 Jan 2013 17:16:51 +0000 (18:16 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 15 Jan 2013 17:16:51 +0000 (18:16 +0100)

Trivial merge