Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 3 Nov 2010 20:41:25 +0000 (21:41 +0100)

Trivial merge