Merge "Merge release-4-6 into master"
authorTeemu Murtola <teemu.murtola@gmail.com>
Mon, 3 Feb 2014 04:45:37 +0000 (05:45 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Mon, 3 Feb 2014 04:45:37 +0000 (05:45 +0100)

Trivial merge