From: Moises Silva <moy@sangoma.com>
Date: Tue, 30 Nov 2010 18:29:21 +0000 (-0500)
Subject: Merge remote branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~247^2~7
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fb2c5ca666692bd25428ba0210562808cc4ab47;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgfs/master'
---

4fb2c5ca666692bd25428ba0210562808cc4ab47