gitorious.org Git - miniature:miniature.git/commit

author	Michael Hasselmann <michael@taschenorakel.de>
	Mon, 5 Apr 2010 20:49:13 +0000 (23:49 +0300)
committer	Michael Hasselmann <michael@taschenorakel.de>
	Mon, 5 Apr 2010 20:52:06 +0000 (23:52 +0300)
commit	943dbfa230d4ef77003ad41f5625e51ca873eb2e
tree	839ee265d85f2f4725f59c0e7ab1b32316469449	tree \| snapshot
parent	a6a66c4648590af7583a0be92428c5ea08cce572	commit \| diff
parent	71bb5ada309ca8197ea8ae7b5fc4f78ea71afbcd	commit \| diff

Fix conflicts

5ce96947d6ebb0d4a7c4aa2946cc8a57e5