From: Konrad Hammel Date: Sat, 30 Oct 2010 00:18:07 +0000 (-0400) Subject: Merge branch 'master' into smgmaster X-Git-Tag: v1.2.3^2~71^2^2~245^2~34 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f3ae0af79ad63adbb27d0c779bcb376b98e76569;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into smgmaster --- f3ae0af79ad63adbb27d0c779bcb376b98e76569