From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 12 Sep 2017 10:01:48 +0000 (+0200)
Subject: Merge branch release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=9a05de960184a62586814ada2a1bb4fa8de4b9d6;p=alexxy%2Fgromacs.git

Merge branch release-2016

No conflicts

Change-Id: Iababf3d2439f1b465ebdf8bcb3d29815cb7830e1
---

9a05de960184a62586814ada2a1bb4fa8de4b9d6