From: Samual Lenks Date: Thu, 9 May 2013 20:57:46 +0000 (-0400) Subject: Merge remote-tracking branch 'origin/master' into samual/respawn_improvements X-Git-Tag: xonotic-v0.7.0~50^2~6 X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=d0b85ebad8d5e857da325eb4fc948d401d725e3b;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/master' into samual/respawn_improvements --- d0b85ebad8d5e857da325eb4fc948d401d725e3b