From: Mario Date: Sat, 31 Dec 2016 05:18:36 +0000 (+0000) Subject: Merge branch 'martin-t/shuffleteams' into 'master' X-Git-Tag: xonotic-v0.8.2~340 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=762a3c2e6e3cefba632282c37130581efa663de5;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'martin-t/shuffleteams' into 'master' Fix shuffleteams Closes #1822 See merge request !393 --- 762a3c2e6e3cefba632282c37130581efa663de5