Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 30 Aug 2011 07:43:50 +0000 (09:43 +0200)

Trivial merge