fix conflict

author Mathieu Rene <mrene@avgs.ca>

Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)

committer Mathieu Rene <mrene@avgs.ca>

Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)
author Mathieu Rene <mrene@avgs.ca>
Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)
committer Mathieu Rene <mrene@avgs.ca>
Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -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>
	Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -0400)
committer	Mathieu Rene <mrene@avgs.ca>
	Thu, 21 Jun 2012 14:40:57 +0000 (10:40 -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