From: Teemu Murtola <teemu.murtola@gmail.com>
Date: Sun, 1 Sep 2013 09:39:18 +0000 (+0200)
Subject: Merge "Merge branch release-4-6 into master"
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=5a62999d39f7a3822b1cbb1cbaead06d832f6e91;p=alexxy%2Fgromacs.git

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

5a62999d39f7a3822b1cbb1cbaead06d832f6e91