]> git.ipfire.org Git - thirdparty/asterisk.git/commit
Merged revisions 378889 via svnmerge from
authorAutomerge script <automerge@asterisk.org>
Thu, 10 Jan 2013 03:20:47 +0000 (03:20 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 10 Jan 2013 03:20:47 +0000 (03:20 +0000)
commit919f772f783a50e59beead03c03954647567812c
treed104206bbf0568e064817eea244756ff6f7aacbf
parentf7e1073af548cca689695a43a5bf6b8f2c293ccd
Merged revisions 378889 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

........
  r378889 | rmudgett | 2013-01-09 20:40:50 -0600 (Wed, 09 Jan 2013) | 8 lines

  * Simplify native bridge code in ast_channel_bridge().

  * Fix an unbalanced manager_bridge_event(unlink) call if
  AST_SOFTHANGUP_UNBRIDGE is set in ast_channel_bridge().

  * Make ast_channel_bridge() use common cleanup code when leaving the
  bridge.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378898 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c