Merge branch 'master' of http://nl.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:45:08 +0000 (17:45 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 2 Nov 2010 16:45:08 +0000 (17:45 +0100)

Trivial merge