Conflicts:
	libs/freetdm/src/include/private/ftdm_core.h

Patched-By: Florian Richter

Check for digits received on sangoma isdn stack to avoid delaying
moving to the ring state if all digits are received at once in
overlap dialing mode

This reverts commit e75d0675.

Revert "Add mod_say_es_ar to debian packaging"
This reverts commit ebb3c8fb.

Conflicts:
	configure.ac

Since we compare our generated control-modules to the one in tree, we
want to match the exact format we use to generate the file.

`dh clean` invokes `dh_testdir`, `dh_auto_clean` and `dh_clean`. We
don't need to invoke dh_clean twice.
Acked-by: Travis Cross <tc@traviscross.com>

When '-g' is passed, freeswitch drops all other groups except for the
given group.  This impacts people who depend on FS having access to
resources that would be allowed by membership to those other groups.

It was possible to override this by setting DAEMON_ARGS in
/etc/default/freeswitch, but we'll go ahead and make this the default.

Since freeswitch uses the primary group of a user when `-g` is
omitted, we'll just omit it, and do similarly when setting the
ownership of our directory in /var/run.
Edited-by: Travis Cross <tc@traviscross.com>

FS-6969 #resolve #comment This patch should accomplish the same and handle other platforms, please test

* commit '544c5faf':
  Add module mod_odbc_cdr

* commit '94278b5e':
  allow enter and exit sounds to interrupt the MOH in a wait_mod conference

Merge pull request #102 in FS/freeswitch from ~AMARUS_CAMERON/freeswitch:mod_fifo-outbound_per_cycle_min to master

* commit '1944f9a5':
  FS-6968 Changes to mod_fifo.c to add outbound_per_cycle_min

* commit 'e75d0675':
  FS-6967 New mod_say_es_AR to support Argentina Spanish variant.

Renaming mod_spandsp's cadence + tone detection APPs and APIs (start_tone_detect / stop_tone_detect) to
spandsp_start_tone_detect and spandsp_stop_tone_detect to resolve conflict with mod_dptools'
tone_detect/stop_tone_detect APPs.

This patch does the following:
* only starts MOH if no other file (sync or async) is currently playing
* adds a variable "conference_permanent_wait_mod_moh" that controls the
  behavior of how the enter and exit sounds interact with the MOH when
  wait_mod is set. When the variable is set, the MOH keeps playing and
  the enter and exit sounds are mixed with the MOH. When the variable
  is unset, then any playing MOH is first stopped, then the enter or
  exit sound is played and the MOH is started again.

This functionality is useful in case the enter and exit sounds are
used to announce the name of the caller, who is joining or leaving a
conference.

FS-5159 #resolve

* commit '8e4423f1':
  Document Dbh.test_reactive, return saner values

Merge pull request #101 in FS/freeswitch from ~RAVENOX/freeswitch:fixes_for_pull_request_#93 to master

* commit 'c97c0e8a':
  Fix for  case-sensitive filesystems
  Fixed code formatting. Return ListDelegate

Depending on which packages are installed, the README.Debian file
might not be there, so we'll spell out the instructions more directly.

Adding rfc6598.auto and adding rfc6598 space to nat.auto acl, This is the NAT444 carrier grade nat space

Return ListDelegate

* commit '3695bdd9':
  set conference flags from a dial plan variable or via +flags{ }

* commit '69d5cda6':
  resolve FS-6809