From: Mario <zacjardine@y7mail.com>
Date: Thu, 3 Dec 2015 09:03:41 +0000 (+0000)
Subject: Merge branch 'terencehill/strzone_fixes' into 'master'
X-Git-Tag: xonotic-v0.8.2~1575
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2bb4c42f723576432bb2c80e0afe0a09ec7350f3;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/strzone_fixes' into 'master'

strzone fixes



See merge request !261
---

2bb4c42f723576432bb2c80e0afe0a09ec7350f3