Merge "Fixing a problem with dh/dl 1-4 interactions" into release-4-6
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 29 Apr 2013 11:20:53 +0000 (13:20 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 29 Apr 2013 11:20:53 +0000 (13:20 +0200)

Trivial merge