Merge "Merge branch release-4-6"
authorMark Abraham <mark.j.abraham@gmail.com>
Mon, 17 Mar 2014 17:06:04 +0000 (18:06 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 17 Mar 2014 17:06:05 +0000 (18:06 +0100)

Trivial merge