From: Mario <mario.mario@y7mail.com>
Date: Mon, 30 Sep 2019 13:43:56 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weaponorder
X-Git-Tag: xonotic-v0.8.5~1253^2~1
X-Git-Url: https://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8e4957c252f8381e37f2a72e227797bf51e5cc2f

Merge branch 'master' into Mario/weaponorder
---

8e4957c252f8381e37f2a72e227797bf51e5cc2f