Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sat, 1 Mar 2014 11:39:26 +0000 (12:39 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 1 Mar 2014 11:39:26 +0000 (12:39 +0100)

Trivial merge