]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge remote branch 'smgfs/master'
authorDavid Yat Sin <dyatsin@sangoma.com>
Fri, 3 Jun 2011 21:48:39 +0000 (17:48 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Fri, 3 Jun 2011 21:48:39 +0000 (17:48 -0400)
commit5e8e23f57e74170f59d6394b66fce65bc7db2d3b
tree577620209af6837444919b5b7831d7448ae95500
parente7da47445afa9dfc014f77acad3a67716e3d55fc
parentbd7672242c31e84c677b4439c0a5663033591edf
Merge remote branch 'smgfs/master'

Conflicts:
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_support.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c
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