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


Trivial merge