Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master
authorLucca Hirschi <lucca.hirschi@gmail.com>
Tue, 3 Jul 2012 14:37:07 +0000 (16:37 +0200)
committerLucca Hirschi <lucca.hirschi@gmail.com>
Tue, 3 Jul 2012 14:37:07 +0000 (16:37 +0200)

Trivial merge