Merge "Merge branch release-4-6 into release-5-0" into release-5-0
authorRoland Schulz <roland@rschulz.eu>
Fri, 9 May 2014 19:04:43 +0000 (21:04 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Fri, 9 May 2014 19:04:44 +0000 (21:04 +0200)

Trivial merge