From: Mario <mario@smbclan.net>
Date: Mon, 8 Aug 2016 11:17:16 +0000 (+1000)
Subject: Merge branch 'master' into Mario/weaponentities
X-Git-Tag: xonotic-v0.8.2~723^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=67db56b06d6333621dc19ba3b8dcf8976f5acfbb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/weaponentities
---

67db56b06d6333621dc19ba3b8dcf8976f5acfbb