From: Michael S Collins Date: Fri, 13 Jan 2012 01:30:53 +0000 (-0800) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2-rc1~19^2~1^2~60 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3cdb6c98ddcf3b8adbe2e7c9c1bb85f436819341;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- 3cdb6c98ddcf3b8adbe2e7c9c1bb85f436819341