Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 19 Feb 2011 16:31:06 +0000 (17:31 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 19 Feb 2011 16:31:06 +0000 (17:31 +0100)

Trivial merge