Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 28 Dec 2010 18:35:09 +0000 (19:35 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 28 Dec 2010 18:35:09 +0000 (19:35 +0100)

Trivial merge