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

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

b12ef86ae1464d5bf43eb113a27e0e5b80fd21a5