From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Fri, 22 Mar 2013 12:27:22 +0000 (+0100)
Subject: Merge "Merge release-4-6 into master"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=e495e640f57cb27c344c53645977e2f6513f6fa1;p=alexxy%2Fgromacs.git

Merge "Merge release-4-6 into master"
---

e495e640f57cb27c344c53645977e2f6513f6fa1