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

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

9d7d15ded27768ac0e60360f500b7b4fe898fb43