Merge "Revert "Revert "AGI: Only defer frames when in an interception routine."""
authorGeorge Joseph <gjoseph@digium.com>
Wed, 16 Nov 2016 23:44:12 +0000 (17:44 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 23:44:12 +0000 (17:44 -0600)
1  2 
main/channel.c

diff --cc main/channel.c
Simple merge