Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 25 Nov 2010 20:29:25 +0000 (21:29 +0100)

Trivial merge