From: Eric des Courtis Date: Tue, 25 May 2010 20:20:57 +0000 (-0400) Subject: Merge branch 'master' of git.freeswitch.org:freeswitch X-Git-Tag: v1.2-rc1~833 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=99738b6a87febb4f255da977ad22bfd6ed8fdbc6;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git.freeswitch.org:freeswitch --- 99738b6a87febb4f255da977ad22bfd6ed8fdbc6