From: Samual Lenks <samual@xonotic.org>
Date: Sat, 1 Jun 2013 05:07:04 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/fix_deathfade'
X-Git-Tag: xonotic-v0.7.0~24
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=3806086769ac43e01ce52e422d76fe47e4f3c380;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/fix_deathfade'
---

3806086769ac43e01ce52e422d76fe47e4f3c380