Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 14:42:36 +0000 (16:42 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Thu, 23 Sep 2010 14:42:36 +0000 (16:42 +0200)

Trivial merge