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

Merge branch release-5-1 into release-2016

Change-Id: Id782b78da4b2080fec208d29b9b4afc363f1418c
---

eb5040f21f7ad5014cb77f51fcfe7c3d3028964f