Merge branch 'master' into martin-t/shuffleteams 393/head
authorMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:29:51 +0000 (11:29 +1000)
committerMario <mario@smbclan.net>
Sat, 31 Dec 2016 01:29:51 +0000 (11:29 +1000)
1  2 
qcsrc/server/command/sv_cmd.qc

Simple merge