Merge branch 'master' of git://git.freeswitch.org/freeswitch

Conflicts:
	conf/autoload_configs/modules.conf.xml
	libs/freetdm/src/ftdm_sched.c
	libs/freetdm/src/ftmod/ftmod_libpri/ftmod_libpri.c
This commit is contained in:
Moises Silva committed 2010-11-09 12:59:48 -05:00
commit 8d66f38212
232 files changed
+57975 -3495

No files matched your search

+1 -1
View File
@@ -105,5 +105,5 @@ say/mod_say_ru
#say/mod_say_th
## Experimental Modules (don't cry if they're broken)
#../../contrib/mod/endpoints/mod_khomp
#endpoints/mod_khomp
#../../contrib/mod/xml_int/mod_xml_odbc