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

Merge branch 'master' into smgmaster
---

b644e7bb1996708aa113b2d6108048006771c0a4