Revert revision 367163.
authorMark Michelson <mmichelson@digium.com>
Mon, 21 May 2012 20:31:53 +0000 (20:31 +0000)
committerMark Michelson <mmichelson@digium.com>
Mon, 21 May 2012 20:31:53 +0000 (20:31 +0000)
commit8b1193087e1459fe11398c8a2a28927779ffb29b
treefa4ffc7e39409604ca5801f511dd3cee715643c1
parente5f1f0496a0abdf472e81f1f818a2a942635b64a
Revert revision 367163.

This should have been committed to my team trunk-digiumphones branch
instead of trunk.

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