Merge branch 'master' of ssh://git.nguyen.vg/tatoo
authorKim Nguyễn <kn@lri.fr>
Thu, 28 Jun 2012 15:29:27 +0000 (17:29 +0200)
committerKim Nguyễn <kn@lri.fr>
Thu, 28 Jun 2012 15:29:27 +0000 (17:29 +0200)
Conflicts:
.gitignore


Trivial merge