]> git.ipfire.org Git - thirdparty/asterisk.git/commit
automerge commit
authorAutomerge Script <automerge@asterisk.org>
Fri, 6 Jul 2007 16:27:34 +0000 (16:27 +0000)
committerAutomerge Script <automerge@asterisk.org>
Fri, 6 Jul 2007 16:27:34 +0000 (16:27 +0000)
commitff0b4e97a180dd288e4e7ed60b38f80a18fe2e55
tree7e95c91adc6aad6254da02c2424c1dca6da2fa1c
parentbadfa8a03eb819525d227b19c1f0a89bae9bb965
automerge commit

git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.2-netsec@73725 65c4cc65-6c06-0410-ace0-fbb531ad65f3
channels/chan_agent.c
channels/chan_sip.c
res/res_config_odbc.c