Merge branch 'origin/release-5-1'
authorMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Dec 2015 01:36:16 +0000 (12:36 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Thu, 10 Dec 2015 02:04:22 +0000 (13:04 +1100)
commit47f991bebae88382a06a404ab78190c1c974b125
treea05354f48b3210a07726a5ba6fd6bd40467f2f38
parent793e70d3c15d1ac179aaa41be701365bd73c3a80
parent8a663f65d34e0e5369bdc243dae9e684a30062a1
Merge branch 'origin/release-5-1'

Change-Id: Ib28050b54b93ee5eabb12414a92424987b769693
src/gromacs/gmxana/gmx_tune_pme.cpp
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdlib/forcerec.cpp
src/gromacs/mdlib/mdrun_signalling.cpp