Merge branch 'martin-t/shuffleteams' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:18:36 +0000 (05:18 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 31 Dec 2016 05:18:36 +0000 (05:18 +0000)
commit762a3c2e6e3cefba632282c37130581efa663de5
treeb54664986a82a4c02102f4474cfe19296618f235
parent78a337e337b8f08759b210146cdb8d2fd534e923
parentad1fc0314153e3f183fc36892aa86126fa269c5e
Merge branch 'martin-t/shuffleteams' into 'master'

Fix shuffleteams

Closes #1822

See merge request !393