From: James Zhang Date: Fri, 2 Dec 2011 00:22:27 +0000 (-0500) Subject: Merge branch 'releases.3.4' of git.sangoma.com:smg_freeswitch into releases.3.4 X-Git-Tag: v1.2.3^2~71^2^2~217^2~14 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9bf25413ed61a2bf0266b4c17fb28e14899772d9;p=thirdparty%2Ffreeswitch.git Merge branch 'releases.3.4' of git.sangoma.com:smg_freeswitch into releases.3.4 --- 9bf25413ed61a2bf0266b4c17fb28e14899772d9