From: Roland Schulz <roland@utk.edu>
Date: Wed, 17 Sep 2014 22:04:10 +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=3516886928cc7051705798824afcf32b84a7a3b6

Merge release-5-0 into master

Change-Id: I44d8158c68dd1804b8456c096b86f52a979c0261
---

3516886928cc7051705798824afcf32b84a7a3b6