Merge "res_pjsip/pjsip_options: Fix From generation on outgoing OPTIONS"
authorzuul <zuul@gerrit.asterisk.org>
Wed, 30 Mar 2016 15:51:42 +0000 (10:51 -0500)
committerGerrit Code Review <gerrit2@gerrit.digium.api>
Wed, 30 Mar 2016 15:51:42 +0000 (10:51 -0500)
commit23d2a561d55bc226414dc839544138d77b49adfa
tree9f250d28c1acd1dc57aeac3a994eee0f94a6b168
parentc4064727d208d61dc29721c52f450f67eb22a445
parentc971a6436646225a159c644644db91ef6de46923
Merge "res_pjsip/pjsip_options:  Fix From generation on outgoing OPTIONS"
res/res_pjsip.c
res/res_pjsip/pjsip_options.c