Merge branch 'joke' of git+ssh://git.deb.at/deb/hackedgotchi into joke
authorFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 20:04:07 +0000 (21:04 +0100)
committerFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 20:04:07 +0000 (21:04 +0100)
commit840f905f7e34ea69bcfba45089a10e18cacb2a13
tree07e40cdfc693e72c835aec92b8f03a6b639e6c10
parent0fad015a827440005fc9072b130370c29d978047
parent7d6358bcb01cd5bbaf8302ff3d4233efd8d07383
Merge branch 'joke' of git+ssh://git.deb.at/deb/hackedgotchi into joke