Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 08:29:20 +0000 (09:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 29 Jan 2011 08:29:20 +0000 (09:29 +0100)

Trivial merge