From: David Yat Sin <dyatsin@sangoma.com>
Date: Thu, 14 Oct 2010 19:31:00 +0000 (-0400)
Subject: Merge branch 'master' of homer:smg_freeswitch
X-Git-Tag: v1.2-rc1~265^2~11^2~188^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16b3218ebe9cdcb51a4a2f60862ddd3bfd761da9;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of homer:smg_freeswitch
---

16b3218ebe9cdcb51a4a2f60862ddd3bfd761da9