From: Moises Silva <moy@sangoma.com>
Date: Tue, 28 Sep 2010 14:47:53 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d69d732c7ee7ad832c5290d95af73d4dbb041be;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

7d69d732c7ee7ad832c5290d95af73d4dbb041be