David Yat Sin 8b0fbe605c Merge branch 'releases.3.5' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
Conflicts:
	.gitignore
	conf/insideout/autoload_configs/modules.conf.xml
	conf/vanilla/autoload_configs/modules.conf.xml
	src/mod/endpoints/mod_sofia/mod_sofia.h
	src/switch_rtp.c
2012-07-25 11:15:18 -04:00
..
2012-02-28 19:21:04 -05:00
2012-03-29 16:14:54 -05:00
2012-05-21 09:58:02 -05:00
2012-05-28 12:24:46 +00:00
2012-04-25 08:59:12 +00:00
2011-11-29 15:38:52 -06:00
2012-07-03 16:04:43 -04:00