Merged revisions 338417 via svnmerge from

Merged revisions 338417 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

................
  r338417 | irroot | 2011-09-29 14:16:42 +0200 (Thu, 29 Sep 2011) | 19 lines

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

  ........
    r338416 | irroot | 2011-09-29 14:13:05 +0200 (Thu, 29 Sep 2011) | 12 lines

    The rtptimeout setting is ignored on a per peer basis.

    Not only is the rtptimeout ignored in some cases but
    rtpkeepalive and rtpholdtimeout is affected.

    this commit also removes rtptimeout/rtpholdtimeout on
    text rtp.

    (closes issue ASTERISK-18559)

    Review: https://reviewboard.asterisk.org/r/1452
  ........
................

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