Merge "Added note about make_edi and flooding in ED paragraph" into release-4-6
authorChristoph Junghans <junghans@votca.org>
Thu, 17 Jan 2013 22:22:10 +0000 (23:22 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 17 Jan 2013 22:22:10 +0000 (23:22 +0100)

Trivial merge