From: Martin Taibr <taibr.martin@gmail.com>
Date: Sun, 6 Aug 2017 14:18:51 +0000 (+0200)
Subject: Merge branch 'martin-t/defaults' into martin-t/okc
X-Git-Tag: xonotic-v0.8.5~2430^2~41
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6c3362162e191402de680067e86ced4331550117;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'martin-t/defaults' into martin-t/okc
---

6c3362162e191402de680067e86ced4331550117