From: TimePath <andrew.hardaker1995@gmail.com>
Date: Sat, 6 Aug 2016 08:14:23 +0000 (+1000)
Subject: Merge branch 'master' into TimePath/scoreboard_elo
X-Git-Tag: xonotic-v0.8.2~748^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=03660ddc8afa9852f26a21faaec376e0d27dcb9b;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into TimePath/scoreboard_elo
---

03660ddc8afa9852f26a21faaec376e0d27dcb9b