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

Merge remote branch 'smgfs/master'
---

3d9ed976cd7fada0b0dc89cc3bff84c7d11a4419