From: Moises Silva <moy@sangoma.com>
Date: Mon, 24 Oct 2011 17:23:45 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=196c6ff75dee62ac3fff9ebd38febede355c1be1;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

196c6ff75dee62ac3fff9ebd38febede355c1be1