Merge branch 'master' into terencehill/ca_bots_fix 389/head
authorterencehill <piuntn@gmail.com>
Tue, 29 Nov 2016 18:22:07 +0000 (19:22 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 29 Nov 2016 18:22:07 +0000 (19:22 +0100)
commitf8d1d29d782183456e036ff96a2f55080d980247
treee61b0e994199c44c5b4cd25a7250b562d2c5df8f
parent9487c07fc17dfca1232b47348df4fb2932dee380
parent83e84f83b1cedfc0db9b5779bea30218f03431d0
Merge branch 'master' into terencehill/ca_bots_fix

Conflicts:
qcsrc/server/mutators/mutator/gamemode_lms.qc
qcsrc/server/bot/default/scripting.qc
qcsrc/server/mutators/mutator/gamemode_lms.qc