]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "ast_framehook_attach() must be called with the channel locked."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 26 Aug 2016 18:27:16 +0000 (13:27 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 26 Aug 2016 18:27:16 +0000 (13:27 -0500)

Trivial merge