From: Moises Silva <moy@sangoma.com>
Date: Tue, 7 Sep 2010 17:39:18 +0000 (-0400)
Subject: Merge remote branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~382
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7fd0f84cce13dd94da7b88a66742eac95e1c60e7;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgfs/master'
---

7fd0f84cce13dd94da7b88a66742eac95e1c60e7