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
..
2011-08-01 09:48:08 -05:00
2011-04-22 21:30:42 -05:00
2012-05-03 18:55:06 -05:00
2012-05-03 16:31:21 -05:00
2010-10-03 05:53:07 -04:00
2011-07-27 12:26:43 -04:00
2012-04-04 16:18:53 -05:00
2010-04-02 01:15:18 -04:00