Merged revisions 78371 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Tue, 7 Aug 2007 17:46:00 +0000 (17:46 +0000)
committerRussell Bryant <russell@russellbryant.com>
Tue, 7 Aug 2007 17:46:00 +0000 (17:46 +0000)
commiteba344f4984aab4cb9b43cd7f67c241e873a16be
tree462b3c54066a9109b646ef1320d1af148669cf6b
parent57769b9a5308d4e068602a11dcf4d88eb3914b62
Merged revisions 78371 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r78371 | russell | 2007-08-07 12:45:30 -0500 (Tue, 07 Aug 2007) | 12 lines

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

........
r78370 | russell | 2007-08-07 12:44:04 -0500 (Tue, 07 Aug 2007) | 4 lines

Revert patch committed for issue #9660.  It broke E&M trunks.
(closes issue #10360)
(closes issue #10364)

........

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

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