From: Lucca Hirschi <lucca.hirschi@gmail.com>
Date: Tue, 3 Jul 2012 14:37:07 +0000 (+0200)
Subject: Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master
X-Git-Tag: Core~11
X-Git-Url: http://git.nguyen.vg/gitweb/?p=tatoo.git;a=commitdiff_plain;h=f514dcb2286ad4679dbf603ce187ebafce0dc59e

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

f514dcb2286ad4679dbf603ce187ebafce0dc59e