From: Christoph Junghans <junghans@votca.org>
Date: Wed, 26 Nov 2014 22:18:01 +0000 (-0700)
Subject: Merge release-5-0 into master
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=ec4e8d4beb49cff1e55074bc8990f272fdc0856a;p=alexxy%2Fgromacs.git

Merge release-5-0 into master

Change-Id: If41f9c458e5d3aa5f841afcd71bc7f72a1f312c7
---

ec4e8d4beb49cff1e55074bc8990f272fdc0856a