Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'
authorJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:43:12 +0000 (21:43 +0200)
committerJakob MG <jakob_mg@hotmail.com>
Thu, 23 Aug 2012 19:43:12 +0000 (21:43 +0200)
commit8dd9e564bf844bd71312218ce4714e6324d6beb5
treee7d812fdbdae860193aaeab94f32c3bbbfc6f563
parent900a3c09e97e21b6db27f930b20edd97f85d340a
parent8ec332c7d3cffdc6b39c3ada385fa41995630589
Merge remote-tracking branch 'origin/terencehill/freezetag_fixes'

Conflicts:
qcsrc/server/cl_client.qc
qcsrc/server/cl_client.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/gamemode_freezetag.qc