From: Mario <mario@smbclan.net>
Date: Sat, 25 Nov 2017 06:37:25 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/kick_teamkiller
X-Git-Tag: xonotic-v0.8.5~2425^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=20b1203291c8a0592aee1bf4ada82cfe05305c4a;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/kick_teamkiller

# Conflicts:
#	mutators.cfg
---

20b1203291c8a0592aee1bf4ada82cfe05305c4a