Merged revisions 61863 via svnmerge from
authorRussell Bryant <russell@russellbryant.com>
Wed, 25 Apr 2007 21:15:19 +0000 (21:15 +0000)
committerRussell Bryant <russell@russellbryant.com>
Wed, 25 Apr 2007 21:15:19 +0000 (21:15 +0000)
commit891a0057061b046d84b1a5348c2b2b39bb679eb9
treee9f8baf56f0cf8a11cd8ded3f392dffcfbbf8442
parent8b2b3e172b5272901d32e507e6f1e8b1630b7844
Merged revisions 61863 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

................
r61863 | russell | 2007-04-25 16:13:15 -0500 (Wed, 25 Apr 2007) | 10 lines

Merged revisions 61862 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r61862 | russell | 2007-04-25 16:06:22 -0500 (Wed, 25 Apr 2007) | 2 lines

Ensure that callerid settings are reset on a reload.

........

................

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