From: Samual Date: Sun, 29 Jul 2012 04:36:31 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/spawn_weapons X-Git-Tag: xonotic-v0.8.0~152^2~408^2~24 X-Git-Url: http://de.git.xonotic.org/?a=commitdiff_plain;h=e346b3e5361253e398a83298de080b85f941b9ce;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/spawn_weapons --- e346b3e5361253e398a83298de080b85f941b9ce