From: Konrad Hammel Date: Fri, 11 Feb 2011 22:04:19 +0000 (-0500) Subject: Merge branch 'master' into smgmaster X-Git-Tag: v1.2.3^2~71^2^2~245^2~17 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=773f6ae40cee6bb375d0f46c8601c8bd65338218;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into smgmaster --- 773f6ae40cee6bb375d0f46c8601c8bd65338218