Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)
committerJan Behrens <zykure@web.de>
Fri, 10 May 2013 13:54:52 +0000 (15:54 +0200)

Trivial merge