From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 28 Sep 2010 19:49:27 +0000 (-0400)
Subject: Merge branch 'master' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~46
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0a80af555e14a77431ff0f03706b1711ce5c2fbc;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into smgmaster
---

0a80af555e14a77431ff0f03706b1711ce5c2fbc