From: Mario <mario@smbclan.net>
Date: Sat, 31 Dec 2016 01:29:51 +0000 (+1000)
Subject: Merge branch 'master' into martin-t/shuffleteams
X-Git-Tag: xonotic-v0.8.2~340^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=ad1fc0314153e3f183fc36892aa86126fa269c5e;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/shuffleteams
---

ad1fc0314153e3f183fc36892aa86126fa269c5e