Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:16:57 +0000 (17:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 14 Nov 2010 16:16:57 +0000 (17:16 +0100)

Trivial merge