Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000 (17:30 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 21 Oct 2010 15:30:55 +0000 (17:30 +0200)

Trivial merge