From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 3 Sep 2010 21:38:35 +0000 (-0400)
Subject: Merge branch 'master' into davidy_test
X-Git-Tag: v1.2-rc1~382^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=d7141be3bc08b9b3216048c73952582f6451c7e1;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' into davidy_test
---

d7141be3bc08b9b3216048c73952582f6451c7e1