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

Merge remote branch 'smgfs/master'
---

4eef1522502d3b510b22e96bd76612290336f5f9