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)
commit3ac34e5b003963141cbbde668cf5cda1b2eaacc9
tree97e84954e3d5745a54f6914f9f11db5b0c7ff97a
parentccde3c8ca63a58a2d93b725e8d215fa96bd0f683
parentb41154774b47ce0d8ea139f5ca48ac1a10055a61
Merge branch 'master' into Mario/wepent_experimental
qcsrc/server/bot/api.qh