From: Moises Silva <moy@sangoma.com>
Date: Fri, 25 Mar 2011 15:15:43 +0000 (-0400)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~120^2~5^2~99
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d09f96d44f097dc4e0d9014f167b407a9d0c04a2;p=thirdparty%2Ffreeswitch.git

Merge branch 'master' of git.freeswitch.org:freeswitch
---

d09f96d44f097dc4e0d9014f167b407a9d0c04a2