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

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

71351184593668cd2343528538de2b5aa2235f05