From: Mathieu Rene <mrene@avgs.ca>
Date: Fri, 20 Jul 2012 18:34:44 +0000 (-0400)
Subject: Merge branch 'nsg-4.3' of git.sangoma.com:smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~137
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0bb82599c5d303bdccd43046ff3a1a43e4a1cc86;p=thirdparty%2Ffreeswitch.git

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

Conflicts:
	src/mod/endpoints/mod_media_gateway/media_gateway.c
---

0bb82599c5d303bdccd43046ff3a1a43e4a1cc86