From: David Yat Sin <dyatsin@sangoma.com>
Date: Tue, 31 Jul 2012 18:18:36 +0000 (-0400)
Subject: Merge branch 'releases.3.4' into releases.3.5
X-Git-Tag: v1.2.3^2~71^2^2^2^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6906c003424ba6381d5425cdf0401d48dd687b10;p=thirdparty%2Ffreeswitch.git

Merge branch 'releases.3.4' into releases.3.5

Conflicts:
	src/include/switch_channel.h
	src/switch_channel.c
---

6906c003424ba6381d5425cdf0401d48dd687b10