Merge "Remove ASTERISK_REGISTER_FILE."
authorzuul <zuul@gerrit.asterisk.org>
Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
1  2 
CHANGES
apps/app_voicemail.c
channels/chan_pjsip.c
res/res_pjsip_sdp_rtp.c

diff --cc CHANGES
Simple merge
Simple merge
Simple merge
Simple merge