Merge remote-tracking branch 'origin/Mario/teamswitch_fix2'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:23:04 +0000 (11:23 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:23:04 +0000 (11:23 +0200)
commitdc2a9a0215a96ea0b0141b4ce6034f6a85003cda
treec4523690d01521601cd6f0bd017d41af461963d3
parentd4f1b4c3ccc42580f62b2d53161fc1bceed4d8b1
parent55f9fb4933a3aab67e64ec3497f9831d8dd481b6
Merge remote-tracking branch 'origin/Mario/teamswitch_fix2'

* origin/Mario/teamswitch_fix2:
  Check allowed teams before counting them
  Team counting requires numbers instead of team IDs