Merge "Remove ASTERISK_REGISTER_FILE."

author zuul <zuul@gerrit.asterisk.org>

Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)

committer Gerrit Code Review <gerrit2@gerrit.digium.api>

Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
author zuul <zuul@gerrit.asterisk.org>
Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
committer Gerrit Code Review <gerrit2@gerrit.digium.api>
Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
diff --cc CHANGES
Simple merge
diff --cc apps/app_voicemail.c
Simple merge
diff --cc channels/chan_pjsip.c
Simple merge
diff --cc res/res_pjsip_sdp_rtp.c
Simple merge
author	zuul <zuul@gerrit.asterisk.org>
	Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
committer	Gerrit Code Review <gerrit2@gerrit.digium.api>
	Fri, 28 Oct 2016 03:23:00 +0000 (22:23 -0500)
		1	2
CHANGES	patch \|	diff1 \|	diff2 \|	blob \| history
apps/app_voicemail.c	patch \|	diff1 \|	diff2 \|	blob \| history
channels/chan_pjsip.c	patch \|	diff1 \|	diff2 \|	blob \| history
res/res_pjsip_sdp_rtp.c	patch \|	diff1 \|	diff2 \|	blob \| history