Merged revisions 328317 via svnmerge from
authorRichard Mudgett <rmudgett@digium.com>
Thu, 14 Jul 2011 23:34:43 +0000 (23:34 +0000)
committerRichard Mudgett <rmudgett@digium.com>
Thu, 14 Jul 2011 23:34:43 +0000 (23:34 +0000)
commit4a7726b605e8a68ad76941295804d3cefdb52522
tree39abea88af518bd8d3bc797366fa13b31cdfd033
parenta525edea595a782bcc3f868703ee85c794728614
Merged revisions 328317 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.10

................
  r328317 | rmudgett | 2011-07-14 18:28:49 -0500 (Thu, 14 Jul 2011) | 13 lines

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

  ........
    r328302 | rmudgett | 2011-07-14 18:12:06 -0500 (Thu, 14 Jul 2011) | 6 lines

    Missing SIP pvt and channel unlock in sip_set_rtp_peer().

    Regression introduced by -r326144.

    Add missing SIP pvt and channel unlock in sip_set_rtp_peer().
  ........
................

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