Merge "Merge release-4-6 into release-5-0" into release-5-0
authorMark Abraham <mark.j.abraham@gmail.com>
Sun, 29 Jun 2014 09:46:03 +0000 (11:46 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 29 Jun 2014 09:46:03 +0000 (11:46 +0200)

Trivial merge