Merge "Merge release-4-6 into release-5-0" into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 29 Sep 2014 15:31:09 +0000 (17:31 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 29 Sep 2014 15:31:10 +0000 (17:31 +0200)

Trivial merge