From: Mark Abraham <mark.j.abraham@gmail.com>
Date: Tue, 20 Dec 2016 12:03:37 +0000 (+1100)
Subject: Merge branch release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=b7b8ceced5384d42b9dcb4f1faa1ac77e4713f58;p=alexxy%2Fgromacs.git

Merge branch release-2016

No conflicts

Change-Id: I175809e0b4f6ebf7dbbe668de66c47c318954b55
---

b7b8ceced5384d42b9dcb4f1faa1ac77e4713f58