From: Mike Jerris <mike@jerris.com>
Date: Thu, 6 Apr 2017 19:39:05 +0000 (+0000)
Subject: Merge pull request #1245 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos... 
X-Git-Tag: v1.8.0~630
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9e73d51a27280dd1c0c7fac9890161a58acd25f8;p=thirdparty%2Ffreeswitch.git

Merge pull request #1245 in FS/freeswitch from ~DRAGOS_OANCEA_NX/freeswitch-dragos-nx:feature/FS-10198/conf_recording_metadata to master

* commit '6a7f9d4a8efa9de77e4afb76436bd3f66545ed30':
  FS-10198: mod_conference: add var in xml to configure audio recording metadata
---

9e73d51a27280dd1c0c7fac9890161a58acd25f8