Merge "Merge branch release-2016"
commit4dbb7fdefc0e8faa2c5dda36eaf1ae4a95c5b501
authorGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 18 Mar 2017 13:07:10 +0000 (18 14:07 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 18 Mar 2017 13:07:10 +0000 (18 14:07 +0100)
tree9e2f99f682e17315db06a36dfaf453483c175e02
parenta16b3a3e0e4c460c366fe19ef5035b2416ef44ff
parentaf67565847c0c1c376b12e5b50ed2c4344e173b7
Merge "Merge branch release-2016"