Merge "res_rtp_asterisk / res_pjsip: Add support for BUNDLE."

diff --cc channels/chan_pjsip.c
Simple merge

diff --cc include/asterisk/rtp_engine.h
Simple merge

diff --cc res/res_pjsip.c
Simple merge

diff --cc res/res_pjsip/pjsip_configuration.c
Simple merge

diff --cc res/res_rtp_asterisk.c
Simple merge