Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 12:56:34 +0000 (13:56 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Thu, 20 Jan 2011 12:56:34 +0000 (13:56 +0100)

Trivial merge