Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 15:54:39 +0000 (17:54 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 20 Aug 2010 15:54:39 +0000 (17:54 +0200)

Trivial merge