Blocked revisions 137527,137529 via svnmerge
........
r137527 | kpfleming | 2008-08-13 15:33:47 -0500 (Wed, 13 Aug 2008) | 5 lines
document dahdichanname option in doc/asterisk-conf.txt
make chan_dahdi read its configuration from zapata.conf if dahdichanname has been set to 'no'
........
r137529 | kpfleming | 2008-08-13 15:42:33 -0500 (Wed, 13 Aug 2008) | 2 lines
remove some more chan_zap references
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@137531
65c4cc65-6c06-0410-ace0-
fbb531ad65f3