Merged revisions 312949 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Tue, 5 Apr 2011 18:47:11 +0000 (18:47 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Tue, 5 Apr 2011 18:47:11 +0000 (18:47 +0000)
commit698a356737bc396c967202feb2620979f1596694
tree6b605e7c36fc7beaf76b3e239839e89e124cd763
parentad30fa75692f92d72be81133de789c6a27d50233
Merged revisions 312949 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r312949 | rmudgett | 2011-04-05 13:45:24 -0500 (Tue, 05 Apr 2011) | 6 lines

  Crash if ISDN span layer 1 is down on initial load.

  Regression from -r312575 B channel shifting during negotiation.

  * Also combine updating the alarm flag with clearing the resetting flag.
........

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