]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into netborder
authorMoises Silva <moy@sangoma.com>
Wed, 15 Dec 2010 16:20:29 +0000 (11:20 -0500)
committerMoises Silva <moy@sangoma.com>
Wed, 15 Dec 2010 16:20:29 +0000 (11:20 -0500)
1  2 
libs/freetdm/src/ftdm_io.c

Simple merge