Merge variable lists
authorMark Spencer <markster@digium.com>
Fri, 30 Jan 2004 06:48:01 +0000 (06:48 +0000)
committerMark Spencer <markster@digium.com>
Fri, 30 Jan 2004 06:48:01 +0000 (06:48 +0000)
commit068fd1d8394f36b3382566a55f1614ebacf2c6df
tree52356a00e56b590cb015bc187bf80631b6b7a47c
parent81cf763a977093780aa5e4597d321295b3eb06b0
Merge variable lists

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