From: Moises Silva <moy@sangoma.com>
Date: Sat, 7 May 2011 02:29:20 +0000 (-0400)
Subject: Merge remote branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~118^2~13
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=929b69ea5d3f7587dbdeb64e51d2d731bb87d7eb;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgfs/master'
---

929b69ea5d3f7587dbdeb64e51d2d731bb87d7eb