Merge release-5-0 into master
authorDavid van der Spoel <spoel@xray.bmc.uu.se>
Sat, 7 Jun 2014 09:54:10 +0000 (11:54 +0200)
committerRoland Schulz <roland@rschulz.eu>
Sat, 7 Jun 2014 15:02:44 +0000 (17:02 +0200)
commitd093b81ba3a64f0a79b455fd96fc16f20a88619d
treea3cee3de28b0776261cdec0f239e3a86f14a8448
parentd2ce400eb9d03d330f3b30733eac7c56bf27008a
parent15184a1bb5e9ac037b2456628484cd1f26a58ecd
Merge release-5-0 into master

Conflicts:
share/top/gurgle.dat

Change-Id: Ide32a9bfed25cda8eeb7869f1c5a878225c85723
share/top/gurgle.dat
src/gromacs/gmxana/gmx_energy.c
src/gromacs/legacyheaders/types/forcerec.h
src/gromacs/legacyheaders/update.h
src/gromacs/mdlib/update.c
src/programs/mdrun/md.cpp