Merged revisions 280235 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Wed, 28 Jul 2010 20:19:21 +0000 (20:19 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Wed, 28 Jul 2010 20:19:21 +0000 (20:19 +0000)
commitb75433a9e6139a40a477e7ea1b74c9f21a9e6ee6
tree1c92c01f35d420de19fb05dc7270b3dbb1322c82
parent9d0deecc2fcf0a5e8c8924651a8956e610239d1e
Merged revisions 280235 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

................
  r280235 | rmudgett | 2010-07-28 15:12:16 -0500 (Wed, 28 Jul 2010) | 9 lines

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

  ........
    r280229 | rmudgett | 2010-07-28 14:57:49 -0500 (Wed, 28 Jul 2010) | 2 lines

    Add missing enum value "unknown" to the SS7 called_nai and calling_nai config options.
  ........
................

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