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

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

fb81a2595885a787e578075f6f2b3f6e8a230539