FS-7062: [mod_sofia] on redirect, when uri are passed in without <> with multiple uris, automatically add the q= header param in decending order.  This should make 300 Multiple Choices work well with devices that require the q param.  If you would like to specify explicit q-values, please use the syntax of redirect where you specify the entire header using the <>

* commit '35ba6a33':
  FS-6766, fix verto caller ringback missing on conference bridge

* commit '843e4953':
  FS-7051: Preserve the annexb=no/yes status

As per RFC4856, Annex B mode for G.729 is disabled if the SDP contains a
fmtp parameter annexb=no and enabled if annexb=yes or the annexb parameter
is missing.

When responding to an offer mod_sangoma_codec always returns an answer
without a fmtp parameter. Even in response to a SDP offer which contains
one. This has the effect of responding to a request to disable Annex B
with an answer that only Annex B is supported.

With this change mod_sangoma_codec copies the fmtp parameter from the
offer to the answer fixing the problem.

Merge pull request #126 in FS/freeswitch from ~HRISTO/freeswitch:timezone-all-mod_say-modules to master

* commit 'a8c5a0c8':
  add timezone support to mod_say_{de,es,ja,nl,th,zh}

* commit '4be62903':
  FS-7052 Moving jb queue swap operation out of the debug block.

Fixes a bug where the jitter buffer implementation wasn't discarding
old packets if debug mode was disabled.

FS-7045 #resolve #comment [mod_rayo] guarantee that dialed call can be joined when answered event is sent.

* commit 'db66cdb5':
  Fix mrcp libraries to build right

This is nothing more than a shameless copy/paste from another mod_say
module, which already had timezone support. It simply checks if the
timezone variable is set and if it contains a valid timezone, then this
timezone will be used when announcing times/dates.

FS-7048 #resolve

Merge pull request #124 in FS/freeswitch from ~MBRANCA/freeswitch:bugfix/OPENZAP-233-compilation-broken-on-x86-systems to master

* commit '382e683b':
  Use FTDM_UINT64_FMT macro to log uint64_t values, in order to not break x86 builds.

FS-7031 #resolve #comment [unimrcp] update library again to pull in upstream fix for --with-sofia-sip=../sofia-sip

FS-7031 [unimrcp] update sofia-sip.m4 so that it can build when relative path is used in configure.gnu --with-sofia-sip

* commit 'f87c335e':
  Only waiting for agent channel to hangup.

Merge pull request #117 in FS/freeswitch from ~UNIXDOG/freeswitch-rneese:bugfix/FS-6848-freesbd10.1-arm-build-failure to master

* commit '9673cf0a':
  Fix for apr build issue fs-6848 freebsd arm

remove hack breaking some cross compile builds.  if you really need this, you should be using new enough glibc anyways