From: Moises Silva <moy@sangoma.com>
Date: Thu, 10 Feb 2011 15:15:15 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~187^2~17
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=46215605f42bf534ab040e63b9bd84a6c34c3e05;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'
---

46215605f42bf534ab040e63b9bd84a6c34c3e05