From: Mario <mario@smbclan.net>
Date: Sat, 10 Dec 2016 06:09:41 +0000 (+1000)
Subject: Merge branch 'master' into DefaultUser/armormega
X-Git-Tag: xonotic-v0.8.2~387^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=26693a3ac060825ce6c7f170d4e65f7ac2a1fb25;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into DefaultUser/armormega

# Conflicts:
#	mutators.cfg
#	qcsrc/common/mutators/mutator/nix/sv_nix.qc
---

26693a3ac060825ce6c7f170d4e65f7ac2a1fb25