From: Roland Schulz <roland@utk.edu>
Date: Thu, 12 Feb 2015 18:38:31 +0000 (-0500)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=a042e92540ec830f13591ebcc49306b9ba1911e0;p=alexxy%2Fgromacs.git

Merge release-5-0 into master

Change-Id: I23579c289b8a057a94cf64b142759934b9402ee5
---

a042e92540ec830f13591ebcc49306b9ba1911e0