From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Wed, 14 Feb 2018 12:54:33 +0000 (+0100)
Subject: Merge branch release-2016 into release-2018
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3f166b33c8af9286d21725774736f41074dbaf5e;p=alexxy%2Fgromacs.git

Merge branch release-2016 into release-2018

This patch has already been incorporated into release-2018

Change-Id: I088c0d44b5620b3eb575e8a1d0a05adeefaee2cc
---

3f166b33c8af9286d21725774736f41074dbaf5e