Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 6 Aug 2010 06:36:35 +0000 (08:36 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 6 Aug 2010 06:36:35 +0000 (08:36 +0200)

Trivial merge