From: Moises Silva <moy@sangoma.com>
Date: Wed, 29 Sep 2010 21:11:24 +0000 (-0400)
Subject: Merge remote branch 'smgorig/master'
X-Git-Tag: v1.2-rc1~291^2~40^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f126b92e2e8c123868217929b3bca0280438195b;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgorig/master'
---

f126b92e2e8c123868217929b3bca0280438195b