From: Samual Date: Tue, 22 Feb 2011 06:03:51 +0000 (-0500) Subject: Merge remote branch 'origin/master' into samual/crosshair_ring_updates X-Git-Tag: xonotic-v0.5.0~309^2~17^2^2~2 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=547b3d9a16c2d5af2a0177600b276cbbccb63cd0;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into samual/crosshair_ring_updates --- 547b3d9a16c2d5af2a0177600b276cbbccb63cd0