]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "chan_sip: Prevent deadlock when issuing "sip show channels"" into 13
authorJoshua Colp <jcolp@digium.com>
Fri, 22 Jul 2016 09:47:13 +0000 (04:47 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 22 Jul 2016 09:47:13 +0000 (04:47 -0500)
1  2 
channels/chan_sip.c

Simple merge