From: Samual Lenks <samual@xonotic.org>
Date: Tue, 11 Jun 2013 07:51:42 +0000 (-0400)
Subject: Merge remote-tracking branch 'origin/master' into samual/weapons
X-Git-Tag: xonotic-v0.8.0~152^2~389
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ac95412d3724c77d53220831c32d6ad1c3996c23;p=xonotic%2Fxonotic-data.pk3dir.git

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

Conflicts:
	qcsrc/server/attic/monsters/monster_zombie.qc
---

ac95412d3724c77d53220831c32d6ad1c3996c23