From: Moises Silva <moy@sangoma.com>
Date: Tue, 17 May 2011 23:54:03 +0000 (-0400)
Subject: Merge remote-tracking branch 'fixleo/master'
X-Git-Tag: v1.2-rc1~118^2~6^2~15^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c0bbed617fc12efd137c41d717f2be0f375d754;p=thirdparty%2Ffreeswitch.git

Merge remote-tracking branch 'fixleo/master'
---

8c0bbed617fc12efd137c41d717f2be0f375d754