Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 23 Jan 2011 18:33:52 +0000 (19:33 +0100)

Trivial merge