From: Lucca Hirschi <lucca.hirschi@gmail.com>
Date: Thu, 28 Jun 2012 15:31:29 +0000 (+0200)
Subject: Merge branch 'master' of ssh://git.nguyen.vg/tatoo into lucca-master
X-Git-Tag: Core~23^2
X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=138bc8c111e8c8a538870e7ab99a0b40686552e6

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

Conflicts:
	.gitignore
---

138bc8c111e8c8a538870e7ab99a0b40686552e6