From: Michael S Collins Date: Fri, 19 Nov 2010 19:42:29 +0000 (-0800) Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~265^2~4^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2783face5ffe68b235e3a3be699bcacf1e56280a;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git://git.freeswitch.org/freeswitch --- 2783face5ffe68b235e3a3be699bcacf1e56280a