Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 12:39:06 +0000 (13:39 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 16 Dec 2010 12:39:06 +0000 (13:39 +0100)

Trivial merge