From: Moises Silva <moy@sangoma.com>
Date: Wed, 1 Jun 2011 00:06:41 +0000 (-0400)
Subject: Merge branch 'releases.3.3' into smgmaster
X-Git-Tag: v1.2.3^2~71^2^2~245^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74532a8b7bdc97b72c95bc4745fc8f5a4e1a7686;p=thirdparty%2Ffreeswitch.git

Merge branch 'releases.3.3' into smgmaster

Conflicts:
	build/modules.conf.in
	libs/freetdm/mod_freetdm/mod_freetdm.c
---

74532a8b7bdc97b72c95bc4745fc8f5a4e1a7686