Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 7 Sep 2010 13:36:39 +0000 (15:36 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 7 Sep 2010 13:36:39 +0000 (15:36 +0200)

Trivial merge