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

Merge pull request #447 in FS/freeswitch from bugfix/FS-7911-v1.4 to v1.4

* commit 'd5d451734047a7dd6f847f6bd875f4a73c0d011d':
  FS-7912: [mod_conference] fix for v1.4 branch to not allocate for conference cdr if conference cdr is disabled
---

3acabb8e3cf286d21090a760fc60297042770d40