From: Michael S Collins Date: Mon, 24 Jan 2011 20:07:00 +0000 (-0800) Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~187^2~1^2~36 X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=d6cfc2f1e9cfd6462ae4b65753cafee45bfd5a5c;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git://git.freeswitch.org/freeswitch --- d6cfc2f1e9cfd6462ae4b65753cafee45bfd5a5c