Merge release-5-0 into master
authorRoland Schulz <roland@utk.edu>
Wed, 17 Sep 2014 22:04:10 +0000 (18:04 -0400)
committerRoland Schulz <roland@utk.edu>
Wed, 17 Sep 2014 22:04:35 +0000 (18:04 -0400)
Change-Id: I44d8158c68dd1804b8456c096b86f52a979c0261

1  2 
cmake/gmxCFlags.cmake

Simple merge