From: Samual Lenks Date: Sat, 1 Jun 2013 02:01:02 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/fix_deathfade X-Git-Tag: xonotic-v0.7.0~24^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ab18855f2de6204798b29f9a7f2adc6382d39d1b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/fix_deathfade --- ab18855f2de6204798b29f9a7f2adc6382d39d1b