From: Mario <mario@smbclan.net>
Date: Thu, 29 Dec 2016 06:02:34 +0000 (+1000)
Subject: Merge branch 'master' into Mario/wepent_experimental
X-Git-Tag: xonotic-v0.8.2~326^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=57fd65c473599b6f069e15fe1e539f205141018b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/wepent_experimental

# Conflicts:
#	qcsrc/common/weapons/weapon/shotgun.qc
---

57fd65c473599b6f069e15fe1e539f205141018b