Merged revisions 330369 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Sun, 31 Jul 2011 00:05:55 +0000 (00:05 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Sun, 31 Jul 2011 00:05:55 +0000 (00:05 +0000)
commita5be6a0f85ee2b28029c024b4a327367822b1982
tree92229a527b57984e4c95b012898c738fb9478e06
parent1c0078286e27ef3a50c922d347e29c90ffd90ddb
Merged revisions 330369 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r330369 | rmudgett | 2011-07-30 18:57:56 -0500 (Sat, 30 Jul 2011) | 11 lines

  Merged revisions 330368 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r330368 | rmudgett | 2011-07-30 18:56:29 -0500 (Sat, 30 Jul 2011) | 4 lines

    Remove some redundant locking code in ast_do_masquerade().

    Also updated some comments.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@330370 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c