Blocked revisions 36725 via svnmerge
authorRussell Bryant <russell@russellbryant.com>
Mon, 3 Jul 2006 04:25:21 +0000 (04:25 +0000)
committerRussell Bryant <russell@russellbryant.com>
Mon, 3 Jul 2006 04:25:21 +0000 (04:25 +0000)
commit73e8e2ab1fae6c7a83fd98b7997440631b39c912
tree9e29310d1f0916eaa0b2301492a9ed5f1c5e093a
parent03a277c5cc64577060d1e614a8e91dc1a30cd089
Blocked revisions 36725 via svnmerge

........
r36725 | russell | 2006-07-03 00:19:09 -0400 (Mon, 03 Jul 2006) | 4 lines

use ast_set_callerid to be more consistent and to make sure that the
"callerid" option in the conf files is always handled the same way and sets ANI
(issue #7285, gkloepfer)

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@36726 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_agent.c
channels/chan_h323.c
channels/chan_iax2.c
channels/chan_jingle.c
channels/chan_mgcp.c
channels/chan_oss.c
channels/chan_phone.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_vpb.c