From: Moises Silva <moy@sangoma.com>
Date: Fri, 21 Jan 2011 20:29:28 +0000 (-0500)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~187^2~13^2~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e086b80632bad6c3afb24320d2fcb74304897a9c;p=thirdparty%2Ffreeswitch.git

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

e086b80632bad6c3afb24320d2fcb74304897a9c