From: Samual Lenks Date: Thu, 26 Jul 2012 04:44:47 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/spawn_weapons X-Git-Tag: xonotic-v0.8.0~152^2~408^2~32 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5526892934ab6298ceadc373fa24771a8e26dab6;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/spawn_weapons --- 5526892934ab6298ceadc373fa24771a8e26dab6