From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Fri, 11 Mar 2016 00:37:02 +0000 (+0100)
Subject: Merge branch release-5-0 into release-5-1
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=6c1b8b9f394fbca707cedfef8a4245bc018be6f8;p=alexxy%2Fgromacs.git

Merge branch release-5-0 into release-5-1

Change-Id: Icb8d7bc8d5639a824fe5f45e72eede3ec7b9d3c9
---

6c1b8b9f394fbca707cedfef8a4245bc018be6f8