From: Mario <zacjardine@y7mail.com>
Date: Fri, 14 Nov 2014 08:37:29 +0000 (+1100)
Subject: Merge branch 'Mario/despawn_effects'
X-Git-Tag: xonotic-v0.8.0~152
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=28931c8069eb1d283f01a26f31ad91d921294d9c;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/despawn_effects'
---

28931c8069eb1d283f01a26f31ad91d921294d9c