From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 12 Oct 2010 15:03:04 +0000 (-0700)
Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch
X-Git-Tag: v1.2-rc1~291^2~7^2~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ef1114dd178e5930ba69841b0f1120787fd0ef60;p=thirdparty%2Ffreeswitch.git

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

ef1114dd178e5930ba69841b0f1120787fd0ef60