Merged revisions 60459 via svnmerge from
authorMatthew Fredrickson <creslin@digium.com>
Fri, 6 Apr 2007 18:25:38 +0000 (18:25 +0000)
committerMatthew Fredrickson <creslin@digium.com>
Fri, 6 Apr 2007 18:25:38 +0000 (18:25 +0000)
commit1031bbba01849fde730664a8553afaac2298f85e
treead13f870a42a7cca94980b78a2aedec5f246271c
parent74076f636864663a2a4cb434e9aa6aea09c6da60
Merged revisions 60459 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r60459 | mattf | 2007-04-06 12:32:31 -0500 (Fri, 06 Apr 2007) | 10 lines

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

........
r60456 | mattf | 2007-04-06 12:03:15 -0500 (Fri, 06 Apr 2007) | 2 lines

There should only be one code path for doing DTMF conditionals on channels.  This fixes it.

........

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

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