From: David van der Spoel <spoel@xray.bmc.uu.se>
Date: Sat, 7 Jun 2014 19:51:18 +0000 (+0200)
Subject: Merge "Merge release-5-0 into master"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3db1d85a5b05053b86b46876ba815288d006a046;p=alexxy%2Fgromacs.git

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

3db1d85a5b05053b86b46876ba815288d006a046