Merge "Merge branch release-2016"
authorGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 20 Dec 2016 20:34:20 +0000 (21:34 +0100)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Tue, 20 Dec 2016 20:34:20 +0000 (21:34 +0100)
1  2 
src/programs/mdrun/membed.cpp

Simple merge