From: Moises Silva <moy@sangoma.com>
Date: Fri, 14 Jan 2011 23:55:55 +0000 (-0500)
Subject: Merge branch 'master' of git.freeswitch.org:freeswitch
X-Git-Tag: v1.2-rc1~199^2~3^2^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=245b88578cd3d7065bd96641fe09acc0c93e3e72;p=thirdparty%2Ffreeswitch.git

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

245b88578cd3d7065bd96641fe09acc0c93e3e72