Merge "Merge release-4-6 into master"
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 30 Oct 2013 14:22:24 +0000 (15:22 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Wed, 30 Oct 2013 14:22:24 +0000 (15:22 +0100)

Trivial merge