From: Mario <zacjardine@y7mail.com>
Date: Wed, 27 Jan 2016 20:56:59 +0000 (+0000)
Subject: Merge branch 'terencehill/damagetext_cleanup' into 'master'
X-Git-Tag: xonotic-v0.8.2~1216
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=19750cfd8bcf5dc2f30122113f88f06380ba0922

Merge branch 'terencehill/damagetext_cleanup' into 'master'

damagetext cleanup



See merge request !274
---

19750cfd8bcf5dc2f30122113f88f06380ba0922