From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 16 Oct 2017 07:53:33 +0000 (+0200)
Subject: Merge branch 'master' into martin-t/uncrustify
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=15554b3613348748a56d3fbd9e89fef658fb9c1a;p=xonotic%2Fxonotic-data.pk3dir.git

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

15554b3613348748a56d3fbd9e89fef658fb9c1a