Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:41:33 +0000 (18:41 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 23 Jun 2013 16:41:33 +0000 (18:41 +0200)

Trivial merge