Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 09:29:38 +0000 (10:29 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 09:29:38 +0000 (10:29 +0100)

Trivial merge