Merged revisions 278167 via svnmerge from
authorTilghman Lesher <tilghman@meg.abyt.es>
Tue, 20 Jul 2010 22:26:23 +0000 (22:26 +0000)
committerTilghman Lesher <tilghman@meg.abyt.es>
Tue, 20 Jul 2010 22:26:23 +0000 (22:26 +0000)
commitef95349d1c8bdda13d2246e4966dec54ca64b97b
treecb65e92c45fac79338cbaa100637ad55e1625225
parentc26791d5f862a7169cee8fb5a6ee51e5601d53d2
Merged revisions 278167 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r278167 | tilghman | 2010-07-20 15:59:06 -0500 (Tue, 20 Jul 2010) | 4 lines

  Do not queue up DTMF frames while a call is on hold.

  (Fixes ABE-2110)
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@278272 65c4cc65-6c06-0410-ace0-fbb531ad65f3
include/asterisk/channel.h
main/autoservice.c
main/features.c