From: Aleksei Iupinov <a.yupinov@gmail.com>
Date: Fri, 19 Jan 2018 10:42:17 +0000 (+0100)
Subject: Merge branch 'release-2018' into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=0005dcb98a1730b4a6078096f5f408b61d070c27;p=alexxy%2Fgromacs.git

Merge branch 'release-2018' into master

Change-Id: I77f2ee791cfe08a3d162605e14b411a18244b4c3
---

0005dcb98a1730b4a6078096f5f408b61d070c27