Merged revisions 214940 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 31 Aug 2009 16:18:33 +0000 (16:18 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 31 Aug 2009 16:18:33 +0000 (16:18 +0000)
commitafe7034e19d2367fe547cee0e940c5cf1b6da19a
tree9ac89fa4e389a0b56a033f34ff7c754d8840bae1
parente1d799cf9e0fefeed2eeae75ef23bf00f668f8e3
Merged revisions 214940 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r214940 | tilghman | 2009-08-31 11:16:52 -0500 (Mon, 31 Aug 2009) | 7 lines

  Also unlock the "other" channel, when returning, due to glare.
  (closes issue #15787)
   Reported by: tim_ringenbach
   Patches:
         chan_local.diff uploaded by tim ringenbach (license 540)
   Tested by: tim_ringenbach
........

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