Merge "fix AdResS and long-range electrostatics warning" into release-4-6
authorRoland Schulz <roland@rschulz.eu>
Sat, 18 Aug 2012 19:30:09 +0000 (21:30 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 18 Aug 2012 19:30:09 +0000 (21:30 +0200)

Trivial merge