From: Mike Jerris <mike@jerris.com>
Date: Fri, 9 Jan 2015 17:47:09 +0000 (-0600)
Subject: Merge pull request #154 in FS/freeswitch from ~SPDITNER/freeswitch-fs-7136:master... 
X-Git-Tag: v1.4.16~1^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eceb399c3dca1f19315e61bbae8ce7a47ebe5ac6;p=thirdparty%2Ffreeswitch.git

Merge pull request #154 in FS/freeswitch from ~SPDITNER/freeswitch-fs-7136:master to master

* commit '85b8631d621f71a5345bc00627f938eb85ffef03':
  Add conference member data to floor event
---

eceb399c3dca1f19315e61bbae8ce7a47ebe5ac6