From: Samual Lenks <samual@xonotic.org>
Date: Mon, 13 May 2013 21:29:52 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/respawn_improvements
X-Git-Tag: xonotic-v0.7.0~50^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cac08f933d832f4b4b63626ddc8c9366f0a69419;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/cl_client.qc
---

cac08f933d832f4b4b63626ddc8c9366f0a69419