Merge remote-tracking branch 'origin/Mario/extralives_fix'

author Samual Lenks <samual@xonotic.org>

Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)

committer Samual Lenks <samual@xonotic.org>

Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)
author Samual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)
committer Samual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)
diff --cc qcsrc/server/mutators/mutator_minstagib.qc
Simple merge
author	Samual Lenks <samual@xonotic.org>
	Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Tue, 4 Jun 2013 20:00:07 +0000 (16:00 -0400)