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

author Kapil Gupta <kgupta@sangoma.com>

Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)

committer Kapil Gupta <kgupta@sangoma.com>

Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)
author Kapil Gupta <kgupta@sangoma.com>
Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)
committer Kapil Gupta <kgupta@sangoma.com>
Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)
diff --cc src/mod/endpoints/mod_media_gateway/media_gateway_stack.h
Simple merge
author	Kapil Gupta <kgupta@sangoma.com>
	Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)
committer	Kapil Gupta <kgupta@sangoma.com>
	Tue, 14 Aug 2012 19:54:31 +0000 (15:54 -0400)