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

author Mathieu Rene <mrene@avgs.ca>

Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)

committer Mathieu Rene <mrene@avgs.ca>

Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)
author Mathieu Rene <mrene@avgs.ca>
Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)
committer Mathieu Rene <mrene@avgs.ca>
Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)
diff --cc src/mod/endpoints/mod_media_gateway/mod_media_gateway.c
Simple merge
author	Mathieu Rene <mrene@avgs.ca>
	Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)
committer	Mathieu Rene <mrene@avgs.ca>
	Wed, 4 Jul 2012 18:46:30 +0000 (14:46 -0400)