From: Mike Jerris <mike@jerris.com>
Date: Thu, 7 Mar 2019 00:47:02 +0000 (-0600)
Subject: Merge pull request #1484 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos... 
X-Git-Tag: v1.8.6~1^2~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3d8e54e6f8d22a6193e6cae14a8343b0453c3619;p=thirdparty%2Ffreeswitch.git

Merge pull request #1484 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:bugfix/FS-11007/mod_conference-fixes to master

* commit 'de7a502d54040f27bb1f1e6a60a982325ee5ad10':
  FS-11007: [mod_conference] API: reply to hup.
  FS-11007: [mod_conference] fix recording counter and remove unused code
---

3d8e54e6f8d22a6193e6cae14a8343b0453c3619