Merge branch 'master' of /var/cache/git/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Wed, 29 Feb 2012 11:32:42 +0000 (12:32 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 29 Feb 2012 11:32:42 +0000 (12:32 +0100)

Trivial merge