From: Samual Lenks Date: Thu, 23 Aug 2012 23:46:01 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/spawn_weapons X-Git-Tag: xonotic-v0.8.0~152^2~408^2~5 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=5cfe22a6d2dafe5732cf558da63ca5333cdd58ca;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/spawn_weapons --- 5cfe22a6d2dafe5732cf558da63ca5333cdd58ca