Merge "Merge branch release-5-0"
authorTeemu Murtola <teemu.murtola@gmail.com>
Sat, 17 Jan 2015 17:34:03 +0000 (18:34 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 17 Jan 2015 17:34:03 +0000 (18:34 +0100)

Trivial merge