From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 19 Feb 2017 12:44:54 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/damagetext
X-Git-Tag: xonotic-v0.8.2~169^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b834eab77489d98d5d722d67c8a96cf6c3549436;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/damagetext
---

b834eab77489d98d5d722d67c8a96cf6c3549436