From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Mon, 18 May 2015 14:42:35 +0000 (+0200)
Subject: Merge "Merge branch origin/release-5-0"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=1eb51a444c082083b04a6872d089e3c12ed3ef69;p=alexxy%2Fgromacs.git

Merge "Merge branch origin/release-5-0"
---

1eb51a444c082083b04a6872d089e3c12ed3ef69