From: Samual Lenks Date: Wed, 8 May 2013 00:24:09 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into terencehill/clear_button X-Git-Tag: xonotic-v0.7.0~55^2~13^2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=2be39968eee26eaafc1099e9d72ccb2066b8414e;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into terencehill/clear_button --- 2be39968eee26eaafc1099e9d72ccb2066b8414e