From: terencehill <piuntn@gmail.com>
Date: Sun, 13 Mar 2016 15:18:28 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/hud_fixes
X-Git-Tag: xonotic-v0.8.2~1015^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6f4c7132e635c0150e3894f2f9958b361ce0c238;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/hud_fixes

Conflicts:
	qcsrc/common/mutators/mutator/damagetext/damagetext.qc
---

6f4c7132e635c0150e3894f2f9958b361ce0c238