From: Samual Lenks <samual@xonotic.org>
Date: Sat, 25 Jan 2014 22:05:36 +0000 (-0500)
Subject: Merge remote-tracking branch 'origin/Mario/teamswitch_fix'
X-Git-Tag: xonotic-v0.8.0~234
X-Git-Url: http://git.xonotic.org/?a=commitdiff_plain;h=53e872ae4dc8dfbe10ed92aa30ec5329a491a4ff;p=xonotic%2Fxonotic-data.pk3dir.git

Merge remote-tracking branch 'origin/Mario/teamswitch_fix'

# By Mario
# Via Mario
* origin/Mario/teamswitch_fix:
  Check if the team is available before killing the player
---

53e872ae4dc8dfbe10ed92aa30ec5329a491a4ff