From: Marc Olivier Chouinard Date: Fri, 13 Aug 2010 23:17:36 +0000 (-0400) Subject: Merge branch 'master' of ssh://git.freeswitch.org/freeswitch X-Git-Tag: v1.2-rc1~526^2~14 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fea3008454a9a0290bd57db967afba7e9c980df9;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org/freeswitch --- fea3008454a9a0290bd57db967afba7e9c980df9