Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 22:17:40 +0000 (00:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 26 May 2010 22:17:40 +0000 (00:17 +0200)

Trivial merge