David Yat Sin 5226489c39 Merge branch 'releases.3.4' into releases.3.5
Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
	libs/freetdm/src/ftdm_state.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_handle.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_main.h
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_out.c
	libs/freetdm/src/ftmod/ftmod_sangoma_ss7/ftmod_sangoma_ss7_xml.c
2012-04-26 16:13:26 -04:00
..
2010-11-01 02:13:27 +01:00
2011-03-06 22:11:39 -05:00
2011-03-17 08:34:00 -05:00
2010-10-06 17:51:29 -03:00
2011-03-11 17:36:42 -05:00
2010-02-09 19:25:26 +00:00
2010-09-30 17:58:25 -04:00
2011-01-21 10:51:34 -05:00

FreeTDM
http://wiki.freeswitch.org/wiki/FreeTDM