Merge hold patch (bug #1840)
authorMark Spencer <markster@digium.com>
Mon, 17 Jan 2005 12:37:55 +0000 (12:37 +0000)
committerMark Spencer <markster@digium.com>
Mon, 17 Jan 2005 12:37:55 +0000 (12:37 +0000)
commit840f035827cd7d75d1601c29d731d594afe330d4
tree34bc6eb8b0c1666b2821cf4e797a9af81b2477e0
parent441c545ccc7d81e9d5162e7325f017b1fe5efe97
Merge hold patch (bug #1840)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@4823 65c4cc65-6c06-0410-ace0-fbb531ad65f3
apps/app_dial.c
channel.c
channels/chan_zap.c
include/asterisk/frame.h
res/res_features.c