From: Moises Silva <moy@sangoma.com>
Date: Fri, 29 Jul 2011 21:03:11 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~236
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d07d4896d4455db48877223f29f2d9f095550554;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

d07d4896d4455db48877223f29f2d9f095550554