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