From: Roland Schulz <roland@utk.edu>
Date: Thu, 19 Jun 2014 19:21:55 +0000 (-0400)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=9789bcb4373ecf9ccd1ea13583c99e831cc6448a;p=alexxy%2Fgromacs.git

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
---

9789bcb4373ecf9ccd1ea13583c99e831cc6448a