Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000 (19:31 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 5 Aug 2010 17:31:04 +0000 (19:31 +0200)

Trivial merge