From: Berk Hess <hess@kth.se>
Date: Sun, 4 Sep 2016 16:29:34 +0000 (+0200)
Subject: Merge branch release-2016
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3ffca8f9e8c58be945f0c9f63755c0aa26358a5f;p=alexxy%2Fgromacs.git

Merge branch release-2016

Change-Id: I11339f3f6ce583827af85fc8187c4f42ae5a8e52
---

3ffca8f9e8c58be945f0c9f63755c0aa26358a5f