Merge "Merge release-4-6 into master"
authorChristoph Junghans <junghans@votca.org>
Tue, 26 Feb 2013 18:34:26 +0000 (19:34 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 26 Feb 2013 18:34:26 +0000 (19:34 +0100)

Trivial merge