Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 29 Jul 2010 16:23:56 +0000 (18:23 +0200)

Trivial merge