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

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

6ca725fdf2ccc340787ca05f91df722ff971cc05