From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 11 Sep 2016 01:07:41 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/damagetext
X-Git-Tag: xonotic-v0.8.2~481^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=dfef328835ce6ec326a4b3ed0ecbb19845352f89;p=xonotic%2Fxonotic-data.pk3dir.git

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

dfef328835ce6ec326a4b3ed0ecbb19845352f89