From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 4 Dec 2017 09:18:21 +0000 (+0100)
Subject: Merge branch release-2016 into release-2018
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=a89205b3226574a7cfd14d8e45feafa4cc661f4f;p=alexxy%2Fgromacs.git

Merge branch release-2016 into release-2018

Change-Id: If84bee0ff744533c841532efbf29e6338c412c5a
---

a89205b3226574a7cfd14d8e45feafa4cc661f4f