Merged revisions 13237 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Thu, 16 Mar 2006 17:46:15 +0000 (17:46 +0000)
committerRussell Bryant <russell@russellbryant.com>
Thu, 16 Mar 2006 17:46:15 +0000 (17:46 +0000)
commit4c49c78e2e0c66628b5fc106b3ea922ba287ab4b
tree72d21c843ad8e45508285f9bd2ad75d06f5ec546
parent1bad8015955234c6e6425d9af1b5a21f3cde301b
Merged revisions 13237 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r13237 | russell | 2006-03-16 12:42:46 -0500 (Thu, 16 Mar 2006) | 3 lines

always use the callerid signalling method set in the zt_pvt strucutre as
opposed to the last one read from the config file (issue #6734, with mods)

........

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