From: Roland Schulz <roland@utk.edu>
Date: Mon, 26 Dec 2011 14:06:22 +0000 (-0500)
Subject: Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6
X-Git-Url: http://biod.pnpi.spb.ru/gitweb/?a=commitdiff_plain;h=3bd9722c1231ec9be33cf1b9c7f7849b7ad167cf;p=alexxy%2Fgromacs.git

Merge remote-tracking branch 'gerrit/release-4-5-patches' into release-4-6

Conflicts:
	src/tools/gmx_tune_pme.c

Change-Id: I0cb93d965cd30a6d0e158eac595fac7c8b891492
---

3bd9722c1231ec9be33cf1b9c7f7849b7ad167cf