From: David Yat Sin <dyatsin@sangoma.com>
Date: Wed, 27 Jun 2012 01:27:03 +0000 (-0400)
Subject: Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3
X-Git-Tag: v1.2.3^2~71^2^2~153^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8de2568c3e1385f1e60d92d837476cf05001332f;p=thirdparty%2Ffreeswitch.git

Merge branch 'nsg-4.3' of ssh://git.sangoma.com/smg_freeswitch into nsg-4.3

Conflicts:
	build/modules.conf.in
---

8de2568c3e1385f1e60d92d837476cf05001332f
diff --cc build/modules.conf.in
index e93ce2c677,e17118c6f6..1d27aaad1b
--- a/build/modules.conf.in
+++ b/build/modules.conf.in
@@@ -11,4 -13,5 +11,3 @@@ endpoints/mod_sofi
  xml_int/mod_xml_cdr
  event_handlers/mod_event_socket
  codecs/mod_sangoma_codec
 -#event_handlers/mod_radius_cdr
--