From: Moises Silva <moy@sangoma.com>
Date: Fri, 3 Sep 2010 19:09:33 +0000 (-0400)
Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch
X-Git-Tag: v1.2-rc1~382^2^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a70192f2c7dd0f0dd1100b157522dd7871b17dc7;p=thirdparty%2Ffreeswitch.git

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

a70192f2c7dd0f0dd1100b157522dd7871b17dc7