Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 19 Nov 2010 12:49:26 +0000 (13:49 +0100)

Trivial merge