Merged revisions 29969 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 24 May 2006 16:19:57 +0000 (16:19 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 24 May 2006 16:19:57 +0000 (16:19 +0000)
commit11d13e1d4bddf963cc5871616d3ca7121400a574
treeb4a7ccb3b8408b603d640e5b5a9b81ebccb9f60a
parent8122c35675e8fba60ed6077595f3afa0fc9065ce
Merged revisions 29969 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r29969 | kpfleming | 2006-05-24 11:17:26 -0500 (Wed, 24 May 2006) | 2 lines

respect 'usecallingpres' in zapata.conf even if CLID has not been set for the channel (issue #7123)

........

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