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

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

3b4e6bcd28b6b3d16304f54fc584c52ce2e57e49