Merge "Merge release-5-0 into master"
authorRoland Schulz <roland@utk.edu>
Mon, 28 Jul 2014 19:05:08 +0000 (21:05 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 28 Jul 2014 19:05:08 +0000 (21:05 +0200)

Trivial merge