From: Moises Silva <moy@sangoma.com>
Date: Tue, 31 Jan 2012 20:37:33 +0000 (-0500)
Subject: Merge branch 'releases.3.4' into releases.3.4.experimental_head
X-Git-Tag: v1.2.3^2~71^2^2~217^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cafff5000521d1083c84e7bf34cd6044c764fcd7;p=thirdparty%2Ffreeswitch.git

Merge branch 'releases.3.4' into releases.3.4.experimental_head

Conflicts:
	libs/freetdm/mod_freetdm/mod_freetdm.c
---

cafff5000521d1083c84e7bf34cd6044c764fcd7