From: Moises Silva <moy@sangoma.com>
Date: Thu, 6 Jan 2011 14:04:57 +0000 (-0500)
Subject: Merge remote branch 'fsorig/master'
X-Git-Tag: v1.2-rc1~221
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=309ced0eace881a2cddcf6807fe467c914ac9bb9;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'fsorig/master'
---

309ced0eace881a2cddcf6807fe467c914ac9bb9