Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 27 Oct 2010 09:28:12 +0000 (11:28 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 27 Oct 2010 09:28:12 +0000 (11:28 +0200)

Trivial merge