From: terencehill <piuntn@gmail.com>
Date: Thu, 8 Sep 2016 15:31:03 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/scoreboard_update
X-Git-Tag: xonotic-v0.8.2~600^2~3
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4f8faeffe1e93fc20750dd8d9af2c62b4541525c;p=xonotic%2Fxonotic-data.pk3dir.git

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

4f8faeffe1e93fc20750dd8d9af2c62b4541525c