Merge branch release-5-0 into release-5-1
authorMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Jan 2016 14:18:06 +0000 (15:18 +0100)
committerMark Abraham <mark.j.abraham@gmail.com>
Tue, 12 Jan 2016 14:18:06 +0000 (15:18 +0100)
commit4b9949f8c2fd84359dfe96ecaf966ad78ae5d9c6
treedb239719f34be76c06ad069a78cffb009a217df4
parentb33a991d7e95ced3e106597129e51a8229dc252e
parent849aee3423ea4177391503f162a7923fa6d04df7
Merge branch release-5-0 into release-5-1

Change-Id: I49ca6d8edc18c764eff368cd396873385f11ea9c
src/programs/mdrun/md.cpp