Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master
authorLucca Hirschi <lucca.hirschi@gmail.com>
Fri, 29 Jun 2012 15:14:34 +0000 (17:14 +0200)
committerLucca Hirschi <lucca.hirschi@gmail.com>
Fri, 29 Jun 2012 15:14:34 +0000 (17:14 +0200)
commit9d7d15ded27768ac0e60360f500b7b4fe898fb43
tree548c9819504e9d1a337c49b8929cbbeed21007ee
parent18b3b333b0e63bb740582964b22062b4c9ed2b8a
parent138bc8c111e8c8a538870e7ab99a0b40686552e6
Merge branch 'lucca-master' of ssh://git.nguyen.vg/tatoo into lucca-master