From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Wed, 29 Jan 2014 05:14:11 +0000 (+0100)
Subject: Merge "Merge branch 'release-4-6'"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=18b716fd8f1b98d127ce4051607ac88e74b6ba08;p=alexxy%2Fgromacs.git

Merge "Merge branch 'release-4-6'"
---

18b716fd8f1b98d127ce4051607ac88e74b6ba08