From: Mario <zacjardine@y7mail.com>
Date: Tue, 31 Mar 2015 15:41:07 +0000 (+1100)
Subject: Merge branch 'master' into Mario/combined_updates
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0079b1ee738754ef8d422641eae641b1a853d8d6;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/combined_updates

Conflicts:
	qcsrc/server/mutators/mutator_instagib.qc
---

0079b1ee738754ef8d422641eae641b1a853d8d6