Merge release-5-0 into release-5-1
commitb7fb47a196bd1d9236fe823efde8a968d93602f4
authorMark Abraham <mark.j.abraham@gmail.com>
Wed, 14 Oct 2015 15:10:46 +0000 (14 17:10 +0200)
committerMark Abraham <mark.j.abraham@gmail.com>
Wed, 14 Oct 2015 15:31:29 +0000 (14 17:31 +0200)
treef8a4d976dbd2379a7d7c933aecbe8cbd6859924f
parentdf199b1e2b7b1b7fe3a9fa3522b1a838268213c4
parent1f04b58864d00c1e243d794f034cddbf1c160d1a
Merge release-5-0 into release-5-1

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