From: Samual Lenks Date: Sat, 11 May 2013 23:56:42 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair X-Git-Tag: xonotic-v0.7.0~53^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=789db90320bdb2045fb532ec9a03fb5869a13133;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into Mario/rainbow_crosshair --- 789db90320bdb2045fb532ec9a03fb5869a13133