Merged revisions 288748 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Fri, 24 Sep 2010 16:11:19 +0000 (16:11 +0000)
committerTerry Wilson <twilson@digium.com>
Fri, 24 Sep 2010 16:11:19 +0000 (16:11 +0000)
commit4e473de5e24ffb6406786f817a499e4ad624f988
tree6584b9fdf244a3ffa425822f1d3f0e6d900910ea
parent794ff358a3edee3734378aed412f048315267906
Merged revisions 288748 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r288748 | twilson | 2010-09-24 09:02:27 -0700 (Fri, 24 Sep 2010) | 19 lines

  Merged revisions 288747 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ................
    r288747 | twilson | 2010-09-24 08:37:39 -0700 (Fri, 24 Sep 2010) | 12 lines

    Merged revisions 288746 via svnmerge from
    https://origsvn.digium.com/svn/asterisk/branches/1.4

    ........
      r288746 | twilson | 2010-09-24 08:26:09 -0700 (Fri, 24 Sep 2010) | 5 lines

      Don't fail a masquerade if it is already being hung up

      This avoids noise on some Local channel situations where we don't use /n.
      Thanks to Alec Davis for the suggestion.
    ........
  ................
................

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