Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Mon, 20 Feb 2012 12:22:38 +0000 (13:22 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 20 Feb 2012 12:22:38 +0000 (13:22 +0100)

Trivial merge