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

Merge branch 'master' into smgmaster
---

65a768e5457e480296c98ca52e695ec21e7346d5