Merge "Revert default rlist/rvdw/rcoulomb to valid values of 1.0" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Jan 2013 22:04:17 +0000 (23:04 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 10 Jan 2013 22:04:17 +0000 (23:04 +0100)

Trivial merge