From: Mike Jerris <mike@jerris.com>
Date: Wed, 5 Nov 2014 22:25:40 +0000 (-0600)
Subject: Merge pull request #69 in FS/freeswitch from ~HRISTO/freeswitch:conference-flags... 
X-Git-Tag: v1.4.14~2^2~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fbe81ff886698127a80b2ed56dd2622a9c270b74;p=thirdparty%2Ffreeswitch.git

Merge pull request #69 in FS/freeswitch from ~HRISTO/freeswitch:conference-flags to master

* commit '3695bdd9e4e0d925ab7296d2f4ce120bf656f623':
  set conference flags from a dial plan variable or via +flags{ }
---

fbe81ff886698127a80b2ed56dd2622a9c270b74