From: Mario <zacjardine@y7mail.com>
Date: Thu, 4 Dec 2014 01:23:38 +0000 (+1100)
Subject: Merge branch 'terencehill/scoreboard_fixes'
X-Git-Tag: xonotic-v0.8.0~130
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6032eff39a0f99228ebb247d69d8e4aa53541cb0;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/scoreboard_fixes'
---

6032eff39a0f99228ebb247d69d8e4aa53541cb0