From: Mario <zacjardine@y7mail.com>
Date: Thu, 13 Nov 2014 11:07:45 +0000 (+1100)
Subject: Merge branch 'Mario/buffs'
X-Git-Tag: xonotic-v0.8.0~171
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=33c60c506532615dba6ce30c3c64ac2fe8b934c0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/buffs'
---

33c60c506532615dba6ce30c3c64ac2fe8b934c0