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)
commitf514dcb2286ad4679dbf603ce187ebafce0dc59e
tree33c33fda0adc2a2a8a16b3eb10a2c0b3e80047ee
parenteb490bfac81cf551554f996a3e1de1993c291acd
parent56887cd3c475e6ee16a7ee5953dfc3d687a12452
Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master