Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sat, 11 Sep 2010 00:23:55 +0000 (02:23 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 11 Sep 2010 00:23:55 +0000 (02:23 +0200)

Trivial merge