Recorded merge of revisions 211112 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Fri, 7 Aug 2009 20:12:21 +0000 (20:12 +0000)
committerRussell Bryant <russell@russellbryant.com>
Fri, 7 Aug 2009 20:12:21 +0000 (20:12 +0000)
commita0582489654a015220afb8c16da3dc7b093c04b6
treeff6cc5960eea0ca96a5e8203dfd06965964ee595
parent20102765bf264284615c02074428ccdfb3cb79a6
Recorded merge of revisions 211112 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r211112 | russell | 2009-08-07 15:11:31 -0500 (Fri, 07 Aug 2009) | 4 lines

  Resolve a deadlock involving app_chanspy and masquerades.

  (ABE-1936)
........

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