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