Merge "Merge release-5-1 into master"
authorErik Lindahl <erik.lindahl@gmail.com>
Thu, 9 Jul 2015 10:56:19 +0000 (12:56 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Thu, 9 Jul 2015 10:56:20 +0000 (12:56 +0200)
commitbe4c77e5c2c4a1512110217d0a3386b6945d11e7
treea55511dfbd3dad7d54e034aec1c79be790e39c07
parentb7cb5f5232b4edb2118b2ba7bd78ef35adebad04
parent6efa33ebea3ba1629d555e0e9e9646ad7e8cc9ad
Merge "Merge release-5-1 into master"