Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 19:33:30 +0000 (21:33 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 27 Aug 2010 19:33:30 +0000 (21:33 +0200)

Trivial merge