Merged revisions 228547 via svnmerge from
authorJoshua Colp <jcolp@digium.com>
Fri, 6 Nov 2009 18:37:59 +0000 (18:37 +0000)
committerJoshua Colp <jcolp@digium.com>
Fri, 6 Nov 2009 18:37:59 +0000 (18:37 +0000)
commitc205958f4c028192f10947236e116cf001469eb3
tree0ad95837bc46546b0d80f58469b54911d97fd3ac
parent7c4fd85293ca618e3b5701913b59bb66282a8633
Merged revisions 228547 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.4

........
  r228547 | file | 2009-11-06 14:32:58 -0400 (Fri, 06 Nov 2009) | 4 lines

  Don't overwrite caller ID name on a trunk with the configured fullname when using users.conf

  (issue ABE-1989)
........

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