From: terencehill <piuntn@gmail.com>
Date: Thu, 13 Sep 2018 11:58:20 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/scoreboard_stuff
X-Git-Tag: xonotic-v0.8.5~1841^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F592%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/scoreboard_stuff
---

67df79b3661a209ea0397c0fa04c432e8c710076