Merge "Merge release-5-0 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 5 Jun 2014 06:53:11 +0000 (08:53 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 5 Jun 2014 06:53:11 +0000 (08:53 +0200)

Trivial merge