From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Mon, 31 Oct 2016 11:39:40 +0000 (+0100)
Subject: Merge branch release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=7604a67f46c7406e5e06344c9bca2effe9b49115;p=alexxy%2Fgromacs.git

Merge branch release-2016

Trivial conflicts for version number and the fix for gmx
wham that was duplicated in each branch.

Change-Id: I0ba030398cc2d3679841000a40db6e8a3f7b68cb
---

7604a67f46c7406e5e06344c9bca2effe9b49115