From: Samual Lenks Date: Fri, 31 May 2013 15:33:10 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/update_effects_tab X-Git-Tag: xonotic-v0.7.0~30^2~1 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=e1aebfe75eb37266c13964374bc9e662feb0e716 Merge remote-tracking branch 'origin/master' into samual/update_effects_tab --- e1aebfe75eb37266c13964374bc9e662feb0e716