From: Konrad Hammel Date: Fri, 10 Dec 2010 21:55:32 +0000 (-0500) Subject: Merge branch 'master' of git.sangoma.com:smg_freeswitch X-Git-Tag: v1.2-rc1~234^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ff07022c264c4414c5a51299b71429f8da2f37fa;p=thirdparty%2Ffreeswitch.git Merge branch 'master' of git.sangoma.com:smg_freeswitch --- ff07022c264c4414c5a51299b71429f8da2f37fa