Merge branch 'master' into Mario/monsters

author Mario <mario.mario@y7mail.com>

Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)

committer Mario <mario.mario@y7mail.com>

Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)
author Mario <mario.mario@y7mail.com>
Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)
committer Mario <mario.mario@y7mail.com>
Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)
diff --cc qcsrc/server/mutators/mutator_minstagib.qc
Simple merge
author	Mario <mario.mario@y7mail.com>
	Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)
committer	Mario <mario.mario@y7mail.com>
	Sat, 12 Oct 2013 05:43:26 +0000 (16:43 +1100)