Merged revisions 64276 via svnmerge from

Merged revisions 64276 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r64276 | file | 2007-05-14 14:36:34 -0400 (Mon, 14 May 2007) | 10 lines

Merged revisions 64275 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r64275 | file | 2007-05-14 14:34:06 -0400 (Mon, 14 May 2007) | 2 lines

Only perform stripping of - strings from the channel name for Zap channels. Anywhere else we might remove a legitimate part of a device name. (issue #9668 reported by stevedavies)

........

................

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