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

Trivial merge