From: Michael S Collins Date: Thu, 16 Sep 2010 23:26:46 +0000 (-0700) Subject: Merge branch 'master' of git://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~320 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7112c94e295833779060c86375ba4bd3daee394a;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git://git.freeswitch.org/freeswitch --- 7112c94e295833779060c86375ba4bd3daee394a