From: Michael S Collins Date: Fri, 11 Mar 2011 18:25:00 +0000 (-0800) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2-rc1~171^2~48^2~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f9c9af38efcddcc91f18739d02da95f0e73f6f4d;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- f9c9af38efcddcc91f18739d02da95f0e73f6f4d