Merge branch 'master' into Mario/wepent_experimental
authorMario <mario@smbclan.net>
Tue, 20 Dec 2016 00:49:24 +0000 (10:49 +1000)
committerMario <mario@smbclan.net>
Tue, 20 Dec 2016 00:49:24 +0000 (10:49 +1000)
1  2 
qcsrc/server/bot/api.qh

Simple merge