Merged revisions 295869 via svnmerge from
authorSean Bright <sean@malleable.com>
Mon, 22 Nov 2010 20:05:10 +0000 (20:05 +0000)
committerSean Bright <sean@malleable.com>
Mon, 22 Nov 2010 20:05:10 +0000 (20:05 +0000)
commitba8fc4ce753d63b1044bc0d7ce08c5538523801c
tree28bbecaf3e0e709226a74e4200bb68d272b7d6c0
parent7c7486ad192cc5d2ca62f0f709e54814998a7095
Merged revisions 295869 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r295869 | seanbright | 2010-11-22 15:03:49 -0500 (Mon, 22 Nov 2010) | 9 lines

  Merged revisions 295868 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.6.2

  ........
    r295868 | seanbright | 2010-11-22 15:02:37 -0500 (Mon, 22 Nov 2010) | 2 lines

    Change some documentation to suggest dahdi_monitor instead of ztmonitor.
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@295870 65c4cc65-6c06-0410-ace0-fbb531ad65f3
configs/chan_dahdi.conf.sample