Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic xonotic-v0.5.0
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 5 Sep 2011 11:09:24 +0000 (13:09 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 5 Sep 2011 11:09:24 +0000 (13:09 +0200)

Trivial merge