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

Merge branch 'releases.3.5' into nsg-4.3
---

848db87c269ef54394e89beec17e6d815a4cc528
diff --cc build/modules.conf.in
index 34ffb2121b,1284bb8bc1..c1de94b75f
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@@ -5,10 -5,9 +5,11 @@@ applications/mod_dptool
  applications/mod_commands
  applications/mod_hash
  applications/mod_spandsp
+ applications/mod_distributor
  dialplans/mod_dialplan_xml
  endpoints/mod_sofia
 +endpoints/mod_opal
 +endpoints/mod_media_gateway
  ../../libs/freetdm/mod_freetdm
  xml_int/mod_xml_cdr
  event_handlers/mod_event_socket