From: Mario <zacjardine@y7mail.com>
Date: Tue, 20 Jan 2015 00:57:08 +0000 (+1100)
Subject: Merge branch 'master' into Mario/vaporizer_damage
X-Git-Tag: xonotic-v0.8.2~1917^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dd7322820d42e8906543b742a7e341e538c30c05;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/vaporizer_damage
---

dd7322820d42e8906543b742a7e341e538c30c05