From: Roland Schulz <roland@rschulz.eu>
Date: Sun, 29 Jun 2014 05:22:10 +0000 (+0200)
Subject: Merge "Merge branch 'release-4-6' into release-5-0" into release-5-0
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3b8efded144e5785313932812bcf42bd89551917;p=alexxy%2Fgromacs.git

Merge "Merge branch 'release-4-6' into release-5-0" into release-5-0
---

3b8efded144e5785313932812bcf42bd89551917