From: David Yat Sin <dyatsin@sangoma.com>
Date: Fri, 3 Dec 2010 19:30:36 +0000 (-0500)
Subject: Merge branch 'master' of git.sangoma.com:smg_freeswitch
X-Git-Tag: v1.2-rc1~243^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8d57adfc61a6a03594893441e5f2e3854331565b;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.sangoma.com:smg_freeswitch
---

8d57adfc61a6a03594893441e5f2e3854331565b