Merge branch release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 4 Nov 2015 14:50:38 +0000 (15:50 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 4 Nov 2015 14:52:23 +0000 (15:52 +0100)
commit5e1616517a30f0f1ced39b36eaaebfaa2dac590e
tree1fd2234e8b88e68d81649c0db84ca5a02205eeef
parentfa654ccc7f0099ffcc63bbed45681b502a77c9f3
parentecafd20e4e36773583102cb7254ab5568a90abbd
Merge branch release-5-1

Change-Id: I199f26f3b928141c166a77b99d47d1ac7edb1877
src/gromacs/domdec/domdec_topology.cpp
src/gromacs/mdlib/mdrun_signalling.cpp