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

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

1f511b62a24107c3ae1e61fa95c17c6e1810f9b7