Merge from 1.4
authorOlle Johansson <oej@edvina.net>
Wed, 25 Oct 2006 16:01:22 +0000 (16:01 +0000)
committerOlle Johansson <oej@edvina.net>
Wed, 25 Oct 2006 16:01:22 +0000 (16:01 +0000)
commit26a00dfaf0000e1ff79a58446e3c51c4d11517f2
treefc0e5816fd09ad56ae427b0efc8b2140b2eb1a92
parent6db742bdc64eb7b06ca67a29b4b402516276aa81
Merge from 1.4

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