Merged revisions 79902 via svnmerge from
authorJason Parker <jparker@digium.com>
Fri, 17 Aug 2007 17:45:01 +0000 (17:45 +0000)
committerJason Parker <jparker@digium.com>
Fri, 17 Aug 2007 17:45:01 +0000 (17:45 +0000)
commit0e83c804802f39b653de8afa413cc70338483e29
tree99c7a4b21843b12d2ce2a08b9c479fab96532b59
parent782b66289857c2ce86988193f95aeb79aa19024d
Merged revisions 79902 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10485)
........
r79902 | qwell | 2007-08-17 12:44:22 -0500 (Fri, 17 Aug 2007) | 4 lines

Re-add the setting of callerid name and number.

Issue 10485, reported by and fix explained by paradise.

........

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