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)
Conflicts:
cmake/gmxVersionInfo.cmake

Change-Id: Iab02dc56743ef0c79e0a0c3f9e7cee7dc18442aa


No differences found