Merge branch 'joke' of git+ssh://git.deb.at/deb/hackedgotchi into joke
authorFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 19:37:28 +0000 (20:37 +0100)
committerFrancesca Ciceri <madamezou@zouish.org>
Sat, 30 Mar 2013 19:37:28 +0000 (20:37 +0100)

Trivial merge