From: Moises Silva <moy@sangoma.com>
Date: Tue, 5 Oct 2010 17:29:15 +0000 (-0400)
Subject: Merge branch 'master' of homer:smg_freeswitch
X-Git-Tag: v1.2-rc1~291^2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7d3c3c843729fa1c6e3766bd5664acdbf4fa16ac;p=thirdparty%2Ffreeswitch.git

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

7d3c3c843729fa1c6e3766bd5664acdbf4fa16ac