From: Carsten Kutzner <ckutzne@gwdg.de>
Date: Thu, 4 Nov 2010 10:51:56 +0000 (+0100)
Subject: Merge branch 'rotation-4-5' into rotation
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=471986d4079bce6030da85e53badcc7a750c58be;p=alexxy%2Fgromacs.git

Merge branch 'rotation-4-5' into rotation

Conflicts:
	src/tools/Makefile.am
---

471986d4079bce6030da85e53badcc7a750c58be