Merge branch 'master' into Mario/tweaks 330/head
authorMario <mario@smbclan.net>
Sat, 25 Jun 2016 20:29:53 +0000 (06:29 +1000)
committerMario <mario@smbclan.net>
Sat, 25 Jun 2016 20:29:53 +0000 (06:29 +1000)
1  2 
qcsrc/server/cl_client.qc

Simple merge