From: Giovanni Maruzzelli Date: Sat, 21 May 2011 07:37:38 +0000 (-0500) Subject: Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch X-Git-Tag: v1.2-rc1~118^2~6 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b65a3ebd18133eda2fea2eadb4972af9ae350de2;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of ssh://git.freeswitch.org:222/freeswitch --- b65a3ebd18133eda2fea2eadb4972af9ae350de2