]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into netborder
authorMoises Silva <moy@sangoma.com>
Wed, 5 Jan 2011 18:34:28 +0000 (13:34 -0500)
committerMoises Silva <moy@sangoma.com>
Wed, 5 Jan 2011 18:34:28 +0000 (13:34 -0500)
1  2 
libs/freetdm/src/ftdm_io.c

Simple merge