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

Merge release-5-0 into master

Change-Id: Ib309c33a5923d50757122b789df9430aaa1ee98d
---

d4312782e36029db9f85c438719296158c89dd83