From: Adam Liwo <jal47@matrix.chem.cornell.edu>
Date: Thu, 5 Jul 2012 10:19:09 +0000 (-0400)
Subject: Merge branch 'adam' into devel
X-Git-Tag: v.3.2~61^2~4
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=158e923530fe6036ef48f63ed0cd34c56a39eee6

Merge branch 'adam' into devel

Conflicts:
	source/unres/src_MD/Makefile_MPICH_ifort
---

158e923530fe6036ef48f63ed0cd34c56a39eee6