Merge "Merge branch release-4-6 into release-5-0" into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 1 Sep 2014 18:56:21 +0000 (20:56 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 1 Sep 2014 18:56:21 +0000 (20:56 +0200)

Trivial merge