Merge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:18:01 +0000 (11:18 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:18:01 +0000 (11:18 +0200)
commit4d88a13318f21331b958f0d7e374c132869a2b85
tree729b87116462f388294af90c01432822f51b4656
parentb9efc43ac4ee0875aae8223bce90b1f08937cd93
parent4ce40ed31c067628acf5a7359901487531730684
Merge remote-tracking branch 'origin/Mario/bot_fire_fix', fixes #1955

* origin/Mario/bot_fire_fix:
  Frozen players shouldn't be able to burn.