From: Mathieu Rene Date: Fri, 27 Jul 2012 14:47:19 +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~120^2~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3fbde17442f67c3b8358489e55c42e7cf2fda4fd;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_cmd_handler.c src/mod/endpoints/mod_media_gateway/media_gateway_xml.c --- 3fbde17442f67c3b8358489e55c42e7cf2fda4fd