From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 1 Sep 2014 16:20:15 +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=c0404b29a5754cb7a0d100a92f7d5b40e2add6a5;p=alexxy%2Fgromacs.git

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

c0404b29a5754cb7a0d100a92f7d5b40e2add6a5