Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorMartin Taibr <taibr.martin@gmail.com>
Tue, 20 Aug 2019 11:43:35 +0000 (13:43 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Tue, 20 Aug 2019 11:43:35 +0000 (13:43 +0200)

Trivial merge