From: Michael S Collins Date: Mon, 17 Jan 2011 23:25:52 +0000 (-0800) Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~187^2~1^2~37 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7c99cd9da80ad23cab7e83de31019b2fb2b721db;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git://git.freeswitch.org/freeswitch --- 7c99cd9da80ad23cab7e83de31019b2fb2b721db