]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "pjsip: Fix deadlock with suspend taskprocessor on masquerade" into 13
authorzuul <zuul@gerrit.asterisk.org>
Thu, 11 Aug 2016 00:19:08 +0000 (19:19 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Thu, 11 Aug 2016 00:19:08 +0000 (19:19 -0500)

Trivial merge