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

Trivial merge