From: Mathieu Rene <mrene@avgs.ca>
Date: Wed, 20 Jun 2012 16:02:38 +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~163^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=badc31f927e8339b4ce7a6775b3aba6f0bb0594b;p=thirdparty%2Ffreeswitch.git

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

badc31f927e8339b4ce7a6775b3aba6f0bb0594b