From: Samual Date: Thu, 24 Feb 2011 02:23:21 +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 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=b43fcd26bdaa013eb27d20bf4f9bc4db853181de;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote branch 'origin/master' into samual/crosshair_ring_updates --- b43fcd26bdaa013eb27d20bf4f9bc4db853181de