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

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

0d276e7d7b7b52ac5510d139d8252fc10ad37298