Merge branch 'joke' of git+ssh://git.deb.at/deb/hackedgotchi into joke