Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:09:54 +0000 (14:09 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 1 Mar 2012 13:09:54 +0000 (14:09 +0100)

Trivial merge