From: Kim Nguyễn <kn@lri.fr>
Date: Thu, 28 Jun 2012 15:29:27 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.nguyen.vg/tatoo
X-Git-Tag: Core~32
X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=b2cdc4af2c951630ded421041378bea7bc0f6b10;hp=155a42d1ddfddfcb71b10d6c127f9ad7dffeac70

Merge branch 'master' of ssh://git.nguyen.vg/tatoo

Conflicts:
	.gitignore
---