Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Thu, 19 Jun 2014 19:21:55 +0000 (15:21 -0400)
committerRoland Schulz <roland@utk.edu>
Thu, 19 Jun 2014 19:21:55 +0000 (15:21 -0400)
commit9789bcb4373ecf9ccd1ea13583c99e831cc6448a
tree776bfa4c5ec84704621c9c58016ab41110356b8c
parentb4223f2f2f797fe3a001a7fc0da8f967a86e8f7e
parentb46785291969128d694a1c24e7ed9822735c0266
Merge release-5-0 into master

Conflicts:
CMakeLists.txt (trivial/backport)

Reverted change to cmake/gmxCFlags.cmake which
shouldn't be merged into master.

Change-Id: I1285fa0b892cbcfc14b53d18b547e396bec5bec3