From: Mike Jerris <mike@jerris.com>
Date: Tue, 1 Sep 2015 18:06:12 +0000 (-0500)
Subject: Merge pull request #448 in FS/freeswitch from bugfix/FS-7911-master to master
X-Git-Tag: v1.6.2~19^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=58fc6abb174e2cb3d58390ae6c909d323cbd1d5d;p=thirdparty%2Ffreeswitch.git

Merge pull request #448 in FS/freeswitch from bugfix/FS-7911-master to master

* commit 'f2514644e1b9964bc4a2f91b8cbe6f8aedf1214b':
  FS-7911: [mod_conference] do not allocate for conference cdr if conference cdr is disabled, and fix leak in conference_record
---

58fc6abb174e2cb3d58390ae6c909d323cbd1d5d