From: Mario <mario.mario@y7mail.com>
Date: Tue, 28 Jun 2016 10:44:34 +0000 (+1000)
Subject: Merge branch 'Mario/fireball_merge'
X-Git-Tag: xonotic-v0.8.2~8
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=9b559a2ac4e325badacae37fe878bba6728e1bc9;p=xonotic%2Fmediasource.git

Merge branch 'Mario/fireball_merge'
---

9b559a2ac4e325badacae37fe878bba6728e1bc9