Merge remote branch 'origin/akari/freezetag-fixes'

author Rudolf Polzer <divVerent@xonotic.org>

Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)

committer Rudolf Polzer <divVerent@xonotic.org>

Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)
author Rudolf Polzer <divVerent@xonotic.org>
Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)
committer Rudolf Polzer <divVerent@xonotic.org>
Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)
diff --cc qcsrc/server/mutators/gamemode_freezetag.qc
Simple merge
author	Rudolf Polzer <divVerent@xonotic.org>
	Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)
committer	Rudolf Polzer <divVerent@xonotic.org>
	Fri, 13 May 2011 15:45:43 +0000 (17:45 +0200)