From: Moises Silva <moy@sangoma.com>
Date: Wed, 28 Sep 2011 23:21:02 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~224
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4488b9d394db99169f598f337c6cd72f42e476f8;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

4488b9d394db99169f598f337c6cd72f42e476f8