From: Mike Jerris <mike@jerris.com>
Date: Wed, 25 Nov 2015 16:47:58 +0000 (-0600)
Subject: Merge pull request #609 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8569... 
X-Git-Tag: v1.6.6~1^2~72^2~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e111c727908e4bccdaec6c4056af7ee55432a71b;p=thirdparty%2Ffreeswitch.git

Merge pull request #609 in FS/freeswitch from ~SJTHOMASON/freeswitch:bugfix/FS-8569 to master

* commit 'e9126a7337af0c824dfa36dfd2f9786f7a6b5bdb':
  Fix undefined symbol conference_cdr_test_mflag
---

e111c727908e4bccdaec6c4056af7ee55432a71b