From: TimePath <andrew.hardaker1995@gmail.com>
Date: Thu, 8 Oct 2015 05:09:36 +0000 (+1100)
Subject: Merge branch 'master' into TimePath/deathtypes
X-Git-Tag: xonotic-v0.8.2~1832^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9231345bfc303d3e7d9bd8a2df62e5aa26327638;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/deathtypes

# Conflicts:
#	qcsrc/common/util-pre.qh
---

9231345bfc303d3e7d9bd8a2df62e5aa26327638