Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorJan Behrens <zykure@web.de>
Sun, 7 Apr 2013 15:02:13 +0000 (17:02 +0200)
committerJan Behrens <zykure@web.de>
Sun, 7 Apr 2013 15:02:13 +0000 (17:02 +0200)

Trivial merge