Merged revisions 130889 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Mon, 14 Jul 2008 23:59:54 +0000 (23:59 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Mon, 14 Jul 2008 23:59:54 +0000 (23:59 +0000)
commite921e6f0def2a84ef1766727e49289212f58ed50
tree2703be680da5685b6773ade2d0db9f18f351fe95
parent88718801b33ad9dc78b3b2a89a9389068a363717
Merged revisions 130889 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
r130889 | tilghman | 2008-07-14 18:59:13 -0500 (Mon, 14 Jul 2008) | 8 lines

Override the callerid in all cases when the callerid is set in the user, not
just when a remote callerid is set.  Also, if not set in the user, allow the
remote CallerID to pass through.
(closes issue #12875)
 Reported by: dimas
 Patches:
       20080714__bug12875.diff.txt uploaded by Corydon76 (license 14)

........

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