Merge branch 'master' into Mario/ctf_updates
authorMario <zacjardine@y7mail.com>
Sat, 6 Dec 2014 02:50:10 +0000 (13:50 +1100)
committerMario <zacjardine@y7mail.com>
Sat, 6 Dec 2014 02:50:10 +0000 (13:50 +1100)
commit71b5d156665cb765874fc36c3fd3daa62ff81d63
tree26847fb9b63b5647a7bd611d9a75e523fef43d31
parent69f035c1e2197669221e2a7a2c93fc9db335d8fb
parent9b61cc050fa27b63946ae2dc72bb0d7960bd3808
Merge branch 'master' into Mario/ctf_updates

Conflicts:
qcsrc/server/mutators/gamemode_ctf.qc
gamemodes.cfg
qcsrc/common/notifications.qh
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc