Merge "Merge release-5-0 into master"
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 7 Jun 2014 19:51:18 +0000 (21:51 +0200)
committerGerrit Code Review <gerrit@gerrit.gromacs.org>
Sat, 7 Jun 2014 19:51:18 +0000 (21:51 +0200)
1  2 
src/programs/mdrun/md.cpp

Simple merge