From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Mon, 22 Sep 2014 17:56:51 +0000 (+0200)
Subject: Merge "Merge release-5-0 into master"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=6617628aee73bc1bd844edb70eefacca249f9b09

Merge "Merge release-5-0 into master"
---

6617628aee73bc1bd844edb70eefacca249f9b09