Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:42 +0000 (16:34 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 28 Apr 2010 14:34:42 +0000 (16:34 +0200)

Trivial merge