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
..
2012-01-11 20:14:17 -05:00
2011-12-06 22:47:22 +08:00
2012-01-05 21:27:03 -06:00
2012-01-24 08:17:17 -06:00
2011-09-16 13:27:38 -05:00
2012-03-01 10:04:07 -06:00
2012-03-29 23:33:11 +08:00
2010-08-19 10:38:54 -05:00
2011-11-07 10:33:38 -06:00
2011-12-15 16:55:10 -05:00
2012-03-14 09:26:32 -05:00
2011-11-03 12:28:18 -04:00