Merge "Merge branch 'release-4-6' into release-5-0" into release-5-0
authorRoland Schulz <roland@rschulz.eu>
Sun, 29 Jun 2014 05:22:10 +0000 (07:22 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sun, 29 Jun 2014 05:22:10 +0000 (07:22 +0200)

Trivial merge