Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 08:17:04 +0000 (09:17 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 7 Nov 2011 08:17:04 +0000 (09:17 +0100)

Trivial merge