Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master
authorLucca Hirschi <lucca.hirschi@gmail.com>
Fri, 29 Jun 2012 15:14:34 +0000 (17:14 +0200)
committerLucca Hirschi <lucca.hirschi@gmail.com>
Fri, 29 Jun 2012 15:14:34 +0000 (17:14 +0200)

Trivial merge