Merge branch release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Fri, 11 Mar 2016 00:37:02 +0000 (01:37 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Fri, 11 Mar 2016 00:37:55 +0000 (01:37 +0100)
Change-Id: Icb8d7bc8d5639a824fe5f45e72eede3ec7b9d3c9

1  2 
src/gromacs/mdlib/sim_util.cpp

Simple merge