From: Mario <zacjardine@y7mail.com>
Date: Fri, 14 Nov 2014 09:16:46 +0000 (+1100)
Subject: Merge remote-tracking branch 'origin/Mario/despawn_effects'
X-Git-Tag: xonotic-v0.8.0~150
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a8adc0d6f831cbad3f3255bcb8c74cdf35a70d76;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/despawn_effects'
---

a8adc0d6f831cbad3f3255bcb8c74cdf35a70d76