From: Mario <mario@smbclan.net>
Date: Thu, 29 Aug 2019 04:44:42 +0000 (+1000)
Subject: Merge branch 'master' into Mario/stats_eloranking
X-Git-Tag: xonotic-v0.8.5~1355^2~2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e0012447bfce1b551df3dc01b043655aa93dafad;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/stats_eloranking
---

e0012447bfce1b551df3dc01b043655aa93dafad