From: wadam <wadam@sangoma.com>
Date: Thu, 1 Dec 2011 16:43:08 +0000 (-0500)
Subject: Merge branch 'releases.3.4' of ssh://git.sangoma.com/smg_freeswitch into releases.3.4
X-Git-Tag: v1.2.3^2~71^2^2~217^2~14^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=16c2da1369fb32e06c65be8f6d2bf22950e27a7f;p=thirdparty%2Ffreeswitch.git

Merge branch 'releases.3.4' of ssh://git.sangoma.com/smg_freeswitch into releases.3.4
---

16c2da1369fb32e06c65be8f6d2bf22950e27a7f