Um, apparently I didn't actually finish merging before committing.
authorMark Michelson <mmichelson@digium.com>
Mon, 8 Sep 2008 22:14:40 +0000 (22:14 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 8 Sep 2008 22:14:40 +0000 (22:14 +0000)
commit0d0c5190fd68aa1633be03ef63eb5a7259932322
tree3bbb8f8cac079af2e91fedce0b0e47cad1d832be
parent13222b52effa3a85a11fb4e60b0a5e661999cae6
Um, apparently I didn't actually finish merging before committing.
Bad bad bad

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