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)
commit138bc8c111e8c8a538870e7ab99a0b40686552e6
treedb5e61f35d0e7c1550424f9241cd37701f6baa3a
parent126758cee2beb8360a6c8bdfd1e115203b71a267
parentb2cdc4af2c951630ded421041378bea7bc0f6b10
Merge branch 'master' of ssh://git.nguyen.vg/tatoo into lucca-master

Conflicts:
.gitignore