Merged revisions 77894 via svnmerge from
authorJason Parker <jparker@digium.com>
Thu, 2 Aug 2007 15:16:53 +0000 (15:16 +0000)
committerJason Parker <jparker@digium.com>
Thu, 2 Aug 2007 15:16:53 +0000 (15:16 +0000)
commite7e927524100f07d53dba5517b2205643c0f8a8b
treed6677e2992f6288c70163099993a73a7f6dc1048
parente27df99e5f20ba4fd2de11fedd3ce63d7a262292
Merged revisions 77894 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

(closes issue #10358)
........
r77894 | qwell | 2007-08-02 10:15:45 -0500 (Thu, 02 Aug 2007) | 5 lines

Make sure that we show the correct extension if dialed from a macro
"From: 5555" rather than "From: s"

Issue 10358, initial patch by DEA, reworked by me to use S_OR, tested by sbisker

........

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