Merge branch 'release-5-0' into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 8 Dec 2015 07:45:22 +0000 (18:45 +1100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 8 Dec 2015 07:45:22 +0000 (18:45 +1100)
commit8a663f65d34e0e5369bdc243dae9e684a30062a1
tree94c50c89b451c884372e6dea0b578bbde7ee91c4
parent860a5922326ff56394d6c87d065388881dda57c4
parent35a893d52e2bcaae8f157036f881f8522095bbf1
Merge branch 'release-5-0' into release-5-1

 Conflicts:
src/gromacs/mdlib/coupling.cpp

Trivial conflict from removing unused variables in release-5-1, but
adding one in release-5-0, resolved by combining both logical changes.

Change-Id: Ib3e762bec8699465d47cbc364fecb424b23aec11
src/gromacs/mdlib/coupling.cpp
src/gromacs/mdlib/forcerec.cpp