mmka.chem.univ.gda.pl Git - unres.git/commit

author	Bartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
	Thu, 8 Nov 2012 18:21:29 +0000 (13:21 -0500)
committer	Bartlomiej Zaborowski <bartek.zaborowski@chem.univ.gda.pl>
	Thu, 8 Nov 2012 18:21:29 +0000 (13:21 -0500)
commit	c5370e6422f68c03f5801e5e8b127a5ba478695b
tree	f0c9bf2f6b4ebd4f8a0569d53eb7032d7a4fed6d	tree \| snapshot
parent	866c6bb3445c32af6d43b6eea1c565ae7d78e7f2	commit \| diff
parent	6c23f8d4f1fe8f0479fb8c6b16ff17e6c59c03d2	commit \| diff

Merge branch 'bartek' of mmka.chem.univ.gda.pl:unres into bartek
Requires git from matrix, becasue of errors: ! [rejected] bartek -> bartek (non-fast-forward)