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

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

df41a0a1c0d2b58b81c0c4d36791dac2bb365d90