Merge release-5-1 into master
authorRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 17:34:31 +0000 (13:34 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 8 Jul 2015 17:34:31 +0000 (13:34 -0400)
commit6efa33ebea3ba1629d555e0e9e9646ad7e8cc9ad
treea411d6ce2848204a309d155769242002779c39fa
parenta751ebf72b76e72acc733b63faaa0215d660e7de
parent90e5c7b64e42dba60be8119a0b1d2e5356673854
Merge release-5-1 into master

Conflicts:
cmake/gmxVersionInfo.cmake

Change-Id: Iab02dc56743ef0c79e0a0c3f9e7cee7dc18442aa
cmake/gmxVersionInfo.cmake
src/gromacs/gmxana/gmx_dos.c
src/gromacs/mdlib/nsgrid.cpp
src/programs/mdrun/runner.cpp