Merged revisions 61799 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 25 Apr 2007 16:23:00 +0000 (16:23 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 25 Apr 2007 16:23:00 +0000 (16:23 +0000)
commitf5d4a16cda0dfd53931deeafa91b5fe1724bc85f
tree0e6d77ecb39feff9fcbce1429860ce4167040a20
parenta751038fbe201b2e6de1c54a6570f364bb3fa00d
Merged revisions 61799 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61799 | russell | 2007-04-25 11:22:07 -0500 (Wed, 25 Apr 2007) | 11 lines

Merged revisions 61798 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61798 | russell | 2007-04-25 11:20:38 -0500 (Wed, 25 Apr 2007) | 3 lines

Fix a typo where cid_num got copied instead of cid_ani.
(issue #9587, reported and patched by xrg)

........

................

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