From: Adam Sieradzan <adasko@piasek2.(none)>
Date: Tue, 5 Nov 2013 13:51:57 +0000 (+0100)
Subject: Merge branch 'adasko' into devel
X-Git-Url: http://mmka.chem.univ.gda.pl/gitweb/?p=unres.git;a=commitdiff_plain;h=5316f1d82cb17d390be734cefbfca809cc65dcc4

Merge branch 'adasko' into devel

Conflicts:
	source/unres/src_MD/Makefile
---

5316f1d82cb17d390be734cefbfca809cc65dcc4