Merged revisions 69661 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Mon, 18 Jun 2007 15:48:05 +0000 (15:48 +0000)
committerJoshua Colp <jcolp@digium.com>
Mon, 18 Jun 2007 15:48:05 +0000 (15:48 +0000)
commit3e4980da79028115802cc471a3c46a456d89b8aa
tree785bab13062bbb8eaeb63e98378dd5a77ccc01b7
parent2b3968410f7a85cd9577a16cb85ede4ecdb869b4
Merged revisions 69661 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r69661 | file | 2007-06-18 11:46:32 -0400 (Mon, 18 Jun 2007) | 2 lines

Few minor transfer tweaks. We can't unlock something we never locked, and better handle a specific scenario with doing an attended transfer between two non-bridged calls.

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@69663 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_sip.c