Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 12:11:15 +0000 (13:11 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 18 Nov 2010 12:11:15 +0000 (13:11 +0100)

Trivial merge