am d6d83279: am 194bbcce: SIP: longer timeout for making call, shorter for cancelling

Merge commit 'd6d83279183db749de07bfdac79fe4180fc848d0'

* commit 'd6d83279183db749de07bfdac79fe4180fc848d0':
  SIP: longer timeout for making call, shorter for cancelling
tree: 4cd25458f677fb86395886c20fcf8059094ecb17
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE