]> git.ipfire.org Git - thirdparty/asterisk.git/commit
automerge commit
authorAutomerge script <automerge@asterisk.org>
Thu, 23 Mar 2006 22:07:47 +0000 (22:07 +0000)
committerAutomerge script <automerge@asterisk.org>
Thu, 23 Mar 2006 22:07:47 +0000 (22:07 +0000)
commitc1d5aad1125c9dd7cf3a42b927affe71c5152315
tree79fe82050eee14c89d094c21002bd70a12f4ccad
parent7cae785261bc0fe841240326667d79c590616e48
automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@14566 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_zap.c
res/res_features.c