Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 6 May 2010 18:17:03 +0000 (20:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 6 May 2010 18:17:03 +0000 (20:17 +0200)

Trivial merge