Merged revisions 280984 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Thu, 5 Aug 2010 07:47:30 +0000 (07:47 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Thu, 5 Aug 2010 07:47:30 +0000 (07:47 +0000)
commitaf43e57821c3823c4ffca9654e4d169fd4ce6573
tree946d1f89328f36df736c48bd99d8724700b9ee17
parent1862c1b4cf5265c7a97d91fe6ede50883b97998c
Merged revisions 280984 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280984 | tilghman | 2010-08-05 02:46:36 -0500 (Thu, 05 Aug 2010) | 22 lines

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

  ................
    r280983 | tilghman | 2010-08-05 02:40:47 -0500 (Thu, 05 Aug 2010) | 15 lines

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

    ........
      r280982 | tilghman | 2010-08-05 02:28:33 -0500 (Thu, 05 Aug 2010) | 8 lines

      Change context lock back to a mutex, because functionality depends upon the lock being recursive.

      (closes issue #17643)
       Reported by: zerohalo
       Patches:
             20100726__issue17643.diff.txt uploaded by tilghman (license 14)
       Tested by: zerohalo
    ........
  ................
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@280985 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/pbx.h
main/pbx.c