]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge remote branch 'fsorig/master'
authorMoises Silva <moy@sangoma.com>
Sat, 17 Dec 2011 22:21:14 +0000 (17:21 -0500)
committerMoises Silva <moy@sangoma.com>
Sat, 17 Dec 2011 22:21:14 +0000 (17:21 -0500)
commit7e31b9cc28fe5bc254b32b591a8d57f57363b551
tree52370f22359868b3e5298279a27d82401d24cf02
parent6f2e3f91ec2f0ae94c47f1046d9842aed2d7f340
parentee4145c72a34111d3e33b07a51de052051dc22bf
Merge remote branch 'fsorig/master'

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
libs/freetdm/mod_freetdm/mod_freetdm.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_rcv.c
src/mod/endpoints/mod_sofia/mod_sofia.c