From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 20 Apr 2011 18:56:11 +0000 (-0400)
Subject: Merge remote branch 'smgfs/master'
X-Git-Tag: v1.2-rc1~118^2~100^2~1^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=775427d5433a3414d63daa6b6e64c0062f29ec14;p=thirdparty%2Ffreeswitch.git

Merge remote branch 'smgfs/master'
---

775427d5433a3414d63daa6b6e64c0062f29ec14