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 16:20:15 +0000 (18:20 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 1 Sep 2014 16:20:15 +0000 (18:20 +0200)

Trivial merge