From: Michael S Collins Date: Wed, 9 May 2012 22:21:21 +0000 (-0700) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2.0~470 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbee3b5aae8037307b5dcd3b27d657462bbf7de8;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- fbee3b5aae8037307b5dcd3b27d657462bbf7de8