From: Mario <zacjardine@y7mail.com>
Date: Tue, 14 Apr 2015 23:00:17 +0000 (+1000)
Subject: Merge branch 'master' into Mario/vaporizer_damage
X-Git-Tag: xonotic-v0.8.2~1917^2~1
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=253cc10990569fd90917dba809ce03c90fc89336;hp=253cc10990569fd90917dba809ce03c90fc89336

Merge branch 'master' into Mario/vaporizer_damage

Conflicts:
	qcsrc/common/weapons/w_vaporizer.qc
---