From: Arnaldo Pereira Date: Thu, 23 Dec 2010 23:23:01 +0000 (-0200) Subject: Merge branch 'master' into arnaldo.r2_reset_channel X-Git-Tag: v1.2-rc1~223^2~5 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=836604cfd3bc5c0990961a14a22c31baeef0c9fe;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into arnaldo.r2_reset_channel --- 836604cfd3bc5c0990961a14a22c31baeef0c9fe