From: Moises Silva <moises.silva@gmail.com>
Date: Tue, 21 Sep 2010 18:06:54 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~52
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3b1f37bd0ce2d402359c38ba32b9704b8cfa1be;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

f3b1f37bd0ce2d402359c38ba32b9704b8cfa1be