]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
Merge "Revert "Revert "Add API for channel frame deferral.""" into 13
authorzuul <zuul@gerrit.asterisk.org>
Wed, 16 Nov 2016 21:06:24 +0000 (15:06 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 21:06:24 +0000 (15:06 -0600)

Trivial merge