From: David van der Spoel <spoel@xray.bmc.uu.se>
Date: Wed, 17 Sep 2014 14:43:01 +0000 (+0200)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?p=alexxy%2Fgromacs.git;a=commitdiff_plain;h=18306d714b31a011860d27ea03a8d45db64476a0

Merge release-5-0 into master

Change-Id: I862e73932dea368b5bac883eb1bf5725314efd2d
---

18306d714b31a011860d27ea03a8d45db64476a0