From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 5 Jul 2011 22:26:13 +0000 (-0400)
Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch
X-Git-Tag: v1.2-rc1~108^2^2~78
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=645f378bcf0ee893518830dda789e05571492e9b;p=thirdparty%2Ffreeswitch.git

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

645f378bcf0ee893518830dda789e05571492e9b