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

author Mathieu Rene <mrene@avgs.ca>

Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)

committer Mathieu Rene <mrene@avgs.ca>

Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)
author Mathieu Rene <mrene@avgs.ca>
Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)
committer Mathieu Rene <mrene@avgs.ca>
Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)
diff --cc src/mod/endpoints/mod_media_gateway/mod_media_gateway.h
Simple merge
author	Mathieu Rene <mrene@avgs.ca>
	Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)
committer	Mathieu Rene <mrene@avgs.ca>
	Fri, 27 Jul 2012 15:04:29 +0000 (11:04 -0400)