Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 20:38:11 +0000 (22:38 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 20:38:11 +0000 (22:38 +0200)

Trivial merge