Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMaidenBeast <fel.sallustio@gmail.com>
Tue, 12 Jul 2011 18:49:21 +0000 (20:49 +0200)
committerMaidenBeast <fel.sallustio@gmail.com>
Tue, 12 Jul 2011 18:49:21 +0000 (20:49 +0200)

Trivial merge