From: Konrad Hammel Date: Fri, 10 Dec 2010 21:59:47 +0000 (-0500) Subject: Merge branch 'master' into smgmaster X-Git-Tag: v1.2.3^2~71^2^2~245^2~31 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84abc3021ba1ea70103b9ffd2fe64b2e0fecd63d;p=thirdparty%2Ffreeswitch.git Merge branch 'master' into smgmaster --- 84abc3021ba1ea70103b9ffd2fe64b2e0fecd63d