From: Samual Lenks <samual@xonotic.org>
Date: Tue, 14 May 2013 02:27:22 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/samual/respawn_improvements'
X-Git-Tag: xonotic-v0.7.0~50
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=697447ac86b204295fb2cb8bae3160b39af2ccfb;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/samual/respawn_improvements'
---

697447ac86b204295fb2cb8bae3160b39af2ccfb