From: root <root@nsg-media-test.sangoma.local>
Date: Wed, 25 Jul 2012 23:56:58 +0000 (-0400)
Subject: Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~123^2~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa40cc9acfaa946dfefdf2ee0081e39d0a30141c;p=thirdparty%2Ffreeswitch.git

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

aa40cc9acfaa946dfefdf2ee0081e39d0a30141c