Merge "Merge release-4-6 into release-5-0" into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 26 Jun 2014 15:07:55 +0000 (17:07 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 26 Jun 2014 15:07:55 +0000 (17:07 +0200)

Trivial merge