]> git.ipfire.org Git - thirdparty/freeswitch.git/commit
Merge pull request #154 in FS/freeswitch from ~SPDITNER/freeswitch-fs-7136:master...
authorMike Jerris <mike@jerris.com>
Fri, 9 Jan 2015 17:47:09 +0000 (11:47 -0600)
committerMike Jerris <mike@jerris.com>
Fri, 9 Jan 2015 17:47:09 +0000 (11:47 -0600)
commiteceb399c3dca1f19315e61bbae8ce7a47ebe5ac6
tree7af9a45e5b3898fc47e4ee228751f0465f7b3f37
parentd199060249dba691630b6008c867f0d1a2ea14f3
parent85b8631d621f71a5345bc00627f938eb85ffef03
Merge pull request #154 in FS/freeswitch from ~SPDITNER/freeswitch-fs-7136:master to master

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