From: Mario <zacjardine@y7mail.com>
Date: Sun, 29 Jan 2017 11:53:34 +0000 (+0000)
Subject: Merge branch 'Mario/ctf_rankings' into 'master'
X-Git-Tag: xonotic-v0.8.2~259
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=37577ef2b6b6c9ef8b13d5bf5a9bf7f3046a3669;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'Mario/ctf_rankings' into 'master'

Merge branch Mario/ctf_rankings (S merge request)

See merge request !405
---

37577ef2b6b6c9ef8b13d5bf5a9bf7f3046a3669