From: Mario <zacjardine@y7mail.com>
Date: Fri, 3 Apr 2015 07:48:19 +0000 (+1100)
Subject: Merge branch 'master' into Mario/buff_updates
X-Git-Tag: xonotic-v0.8.1~18^2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4510cc7248f1192cc057382e924b1cbec279769e;p=xonotic%2Fxonotic-data.pk3dir.git

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

4510cc7248f1192cc057382e924b1cbec279769e