Merged revisions 335434 via svnmerge from
authorMatthew Nicholson <mnicholson@digium.com>
Mon, 12 Sep 2011 15:56:27 +0000 (15:56 +0000)
committerMatthew Nicholson <mnicholson@digium.com>
Mon, 12 Sep 2011 15:56:27 +0000 (15:56 +0000)
commit638f34df7f58ba98a74f0b5c9bd4b416dfc87a67
tree5c8727f8d5b2996009d68dade6b568e6e6cbba2a
parent5c6d4382317987d7f3321bbebe931c6ee75fe6d5
Merged revisions 335434 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r335434 | mnicholson | 2011-09-12 10:55:48 -0500 (Mon, 12 Sep 2011) | 13 lines

  Merged revisions 335433 via svnmerge from
  https://origsvn.digium.com/svn/asterisk/branches/1.8

  ........
    r335433 | mnicholson | 2011-09-12 10:54:41 -0500 (Mon, 12 Sep 2011) | 6 lines

    Properly set caller_warning and callee_warning before we try to use them.

    ASTERISK-18199
    Patch by: elguero
    Testing by: rtang
  ........
................

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@335435 65c4cc65-6c06-0410-ace0-fbb531ad65f3
main/channel.c