From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Thu, 12 May 2016 22:07:37 +0000 (+0200)
Subject: Merge branch release-5-1 into release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=7c0b3b79feadb20d8d54a7f93520a19d88f195cd;p=alexxy%2Fgromacs.git

Merge branch release-5-1 into release-2016

Change-Id: I4195829e82c50f3d0aa04644a99ae53beb2e24c3
---

7c0b3b79feadb20d8d54a7f93520a19d88f195cd