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

Merge branch 'master' into smgmaster
---

f1dc7b1ddb820ad90c027ccf2e160a6529d19f4a