Merged revisions 313366 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Mon, 11 Apr 2011 22:28:43 +0000 (22:28 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Mon, 11 Apr 2011 22:28:43 +0000 (22:28 +0000)
commit530afe7d97832a611b3a767cae2d17015465c3c7
treecd8da39af2c3e44e6a7b5fce88deae2aa56ed41c
parent945ceb9ac7f8fbdbd779dd48490ac64d2574b165
Merged revisions 313366 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r313366 | rmudgett | 2011-04-11 17:27:25 -0500 (Mon, 11 Apr 2011) | 2 lines

  Added "Connected Line ID" and "Connected Line ID Name" to "core show channel" output.
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@313367 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/cli.c