From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 7 Jan 2011 22:46:28 +0000 (-0500)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~207^2~1^2~18
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=285ac684d7f5f9e8367d292d0c7f43a6a61705e3;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.freeswitch.org:freeswitch
---

285ac684d7f5f9e8367d292d0c7f43a6a61705e3