Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sat, 18 Jan 2014 13:57:19 +0000 (14:57 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 18 Jan 2014 13:57:19 +0000 (14:57 +0100)

Trivial merge