]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
FS-5561 --resolve
authorAnthony Minessale <anthm@freeswitch.org>
Wed, 24 Jul 2013 21:15:16 +0000 (16:15 -0500)
committerAnthony Minessale <anthm@freeswitch.org>
Wed, 24 Jul 2013 21:15:16 +0000 (16:15 -0500)
Merge remote-tracking branch 'moy/blind-transfer-response'

1  2 
src/mod/endpoints/mod_sofia/mod_sofia.c
src/mod/endpoints/mod_sofia/sofia.c

Simple merge