Merge release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 11 Nov 2015 15:50:05 +0000 (16:50 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 11 Nov 2015 15:50:05 +0000 (16:50 +0100)
commit70d086ad8226640b7b64b930089ea89168684e4e
treef35441a7abdfc8672074703ef363c92ce8d6d29e
parenta9d8284783dbb11f79db7f1f510f534504450c20
parentedb944fef82a066f14987076dfad6d14fa796198
Merge release-5-0 into release-5-1

Change-Id: I292a7eab69893472723338b44b4653f725f7294f
src/gromacs/mdlib/clincs.cpp