From: Roland Schulz <roland@rschulz.eu>
Date: Fri, 9 May 2014 19:04:43 +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=1425e812d96d04fd2323f3471a1d21682ee7b8db;p=alexxy%2Fgromacs.git

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

1425e812d96d04fd2323f3471a1d21682ee7b8db