From: Mario <zacjardine@y7mail.com>
Date: Thu, 9 Jul 2015 08:27:12 +0000 (+0000)
Subject: Merge branch 'terencehill/shuffleteams_fix' into 'master'
X-Git-Tag: xonotic-v0.8.1~47
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=12272b26539adfd5dd62c4c59c397ab12b1114be;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'terencehill/shuffleteams_fix' into 'master'

shuffleteams: properly detect ca players. It fixes #1471 "Shuffleteams results in uneven teams (CA)"

See merge request !136
---

12272b26539adfd5dd62c4c59c397ab12b1114be