Moises Silva 7bd2d154d6 Merge branch 'smgmaster' into releases.3.4.experimental_head
Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.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_relay.c
	src/mod/endpoints/mod_sofia/mod_sofia.c
	src/mod/endpoints/mod_sofia/sofia_glue.c
2011-12-17 17:42:34 -05:00
..
2011-12-17 17:25:36 -05:00
2011-02-03 23:46:19 -06:00
2011-12-06 22:47:22 +08:00
2011-12-15 11:35:33 -05:00
2010-11-24 03:58:22 +00:00
2011-09-16 13:27:38 -05:00
2011-12-16 07:35:05 -05:00
2011-12-15 21:23:19 -05:00
2010-08-19 10:38:54 -05:00
2011-08-02 13:05:45 -05:00
2011-11-07 10:33:38 -06:00
2010-03-30 14:25:13 -04:00
2011-12-15 16:55:10 -05:00
2010-02-23 22:56:54 +00:00
2011-11-03 12:28:18 -04:00