]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into netborder
authorArnaldo Pereira <arnaldo@sangoma.com>
Tue, 7 Dec 2010 01:20:56 +0000 (23:20 -0200)
committerArnaldo Pereira <arnaldo@sangoma.com>
Tue, 7 Dec 2010 01:20:56 +0000 (23:20 -0200)
1  2 
libs/freetdm/src/ftdm_io.c
libs/freetdm/src/ftmod/ftmod_sangoma_isdn/ftmod_sangoma_isdn_stack_hndl.c

Simple merge