Merge "Merge release-5-0 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Thu, 31 Jul 2014 17:57:12 +0000 (19:57 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 31 Jul 2014 17:57:12 +0000 (19:57 +0200)

Trivial merge