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)
commitb2cdc4af2c951630ded421041378bea7bc0f6b10
treedb5e61f35d0e7c1550424f9241cd37701f6baa3a
parent155a42d1ddfddfcb71b10d6c127f9ad7dffeac70
parent7abccd2e949e2c807eab43c5f0e9b8cc80888484
Merge branch 'master' of ssh://git.nguyen.vg/tatoo

Conflicts:
.gitignore