From: Mario <mario@smbclan.net>
Date: Sun, 27 Aug 2017 14:08:11 +0000 (+1000)
Subject: Merge branch 'master' into Mario/target_teleporter_v2
X-Git-Tag: xonotic-v0.8.5~2421^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e87123e5fba23f7a8907e6fbab241c5eec5be168;p=xonotic%2Fxonotic-data.pk3dir.git

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

e87123e5fba23f7a8907e6fbab241c5eec5be168