Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Thu, 29 Aug 2013 11:51:26 +0000 (13:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 29 Aug 2013 11:51:26 +0000 (13:51 +0200)

Trivial merge