From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 20 Apr 2011 18:44:58 +0000 (-0400)
Subject: Merge branch 'master' of git.sangoma.com:smg_freeswitch
X-Git-Tag: v1.2-rc1~120
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ed11f2fed7da294ad124644d51ad89c12d5dbdb9;p=thirdparty%2Ffreeswitch.git

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

ed11f2fed7da294ad124644d51ad89c12d5dbdb9