Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Fri, 9 Aug 2013 12:30:44 +0000 (14:30 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 9 Aug 2013 12:30:44 +0000 (14:30 +0200)

Trivial merge