From: Mario <zacjardine@y7mail.com>
Date: Tue, 14 Apr 2015 22:26:03 +0000 (+1000)
Subject: Merge branch 'master' into Mario/buff_updates
X-Git-Tag: xonotic-v0.8.1~18^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=459113c6b47ab71204088b818e745879c0e80b25;p=xonotic%2Fxonotic-data.pk3dir.git

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

459113c6b47ab71204088b818e745879c0e80b25