From: Mario <zacjardine@y7mail.com>
Date: Fri, 21 Aug 2015 05:54:22 +0000 (+1000)
Subject: Merge branch 'master' into Mario/is_macro
X-Git-Tag: xonotic-v0.8.2~2064^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a11e3217808e6c8f2c971401ba2bcc43578832b1;p=xonotic%2Fxonotic-data.pk3dir.git

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

a11e3217808e6c8f2c971401ba2bcc43578832b1