From: Roland Schulz <roland@utk.edu>
Date: Wed, 10 Sep 2014 04:16:09 +0000 (-0400)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=1ff3f3bf02fa4457248228557ab0d3ffbbb7cd76

Merge release-5-0 into master

Conflicts:
	CMakeLists.txt
		only version changes not needed in master
	src/gromacs/utility/gmxassert.h
		better fix already in master

Change-Id: I8af70d807972758149e9f69b420d528269e9bebd
---

1ff3f3bf02fa4457248228557ab0d3ffbbb7cd76