]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
Merge branch 'master' into davidy.channel_restart
authorDavid Yat Sin <dyatsin@sangoma.com>
Wed, 15 Dec 2010 17:58:38 +0000 (12:58 -0500)
committerDavid Yat Sin <dyatsin@sangoma.com>
Wed, 15 Dec 2010 17:58:38 +0000 (12:58 -0500)
1  2 
libs/freetdm/src/ftdm_io.c

Simple merge