Merged revisions 55954 via svnmerge from
authorJason Parker <jparker@digium.com>
Wed, 21 Feb 2007 20:30:54 +0000 (20:30 +0000)
committerJason Parker <jparker@digium.com>
Wed, 21 Feb 2007 20:30:54 +0000 (20:30 +0000)
commit28a6129af81ad441a738fac817f3f57930bd1fdf
treedeccd9bec825039cecb28c8778f85d1ed7d47110
parentcdf9cab49dce1f894c84f2af22d17dd40028e894
Merged revisions 55954 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r55954 | qwell | 2007-02-21 14:27:08 -0600 (Wed, 21 Feb 2007) | 4 lines

Fix locking issue, and accept "transport-accept" as a valid accept message.

This should solve issues 8970 and 8503.

........

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