Vineet Chuaudhary / FreeSWITCH-FS-7269 / 086c397cdc9

Commits

David Yat Sin committed 086c397cdc9M10 Nov 2010

Merge branch 'master' into netborder

Conflicts:
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn.h
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_cntrl.c
	libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
	libs/freetdm/src/include/private/ftdm_core.h

Showing diff to6cbf8a0167d