Merge "core: Remove 'Data Retrieval API'"
authorJenkins2 <jenkins2@gerrit.asterisk.org>
Fri, 7 Jul 2017 20:42:56 +0000 (15:42 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 7 Jul 2017 20:42:56 +0000 (15:42 -0500)
1  2 
channels/chan_sip.c
main/channel.c

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