]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into davidy_test
authorDavid Yat Sin <dyatsin@sangoma.com>
Fri, 3 Sep 2010 21:38:35 +0000 (17:38 -0400)
committerDavid Yat Sin <dyatsin@sangoma.com>
Fri, 3 Sep 2010 21:38:35 +0000 (17:38 -0400)
1  2 
libs/freetdm/src/ftdm_io.c

Simple merge