Merge "Revert "Revert "Add API for channel frame deferral."""
authorGeorge Joseph <gjoseph@digium.com>
Wed, 16 Nov 2016 23:43:46 +0000 (17:43 -0600)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 16 Nov 2016 23:43:46 +0000 (17:43 -0600)
1  2 
include/asterisk/channel.h
main/channel.c

Simple merge
diff --cc main/channel.c
Simple merge