From: Michael S Collins Date: Mon, 2 Jul 2012 17:09:53 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2.0~232 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=12a92f5d8560e68c0836ea0f2da9e2f9b71940a0;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- 12a92f5d8560e68c0836ea0f2da9e2f9b71940a0