Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 16:21:25 +0000 (17:21 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 19 Jan 2011 16:21:25 +0000 (17:21 +0100)

Trivial merge