Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3

author Mathieu Rene <mrene@avgs.ca>

Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)

committer Mathieu Rene <mrene@avgs.ca>

Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)
author Mathieu Rene <mrene@avgs.ca>
Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)
committer Mathieu Rene <mrene@avgs.ca>
Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)
diff --cc src/mod/endpoints/mod_media_gateway/media_gateway_xml.c
Simple merge
diff --cc src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
Simple merge
author	Mathieu Rene <mrene@avgs.ca>
	Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)
committer	Mathieu Rene <mrene@avgs.ca>
	Fri, 29 Jun 2012 20:30:54 +0000 (16:30 -0400)
		1	2
src/mod/endpoints/mod_media_gateway/media_gateway_xml.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/mod/endpoints/mod_media_gateway/mod_media_gateway.c	patch \|	diff1 \|	diff2 \|	blob \| history