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