Merged revisions 339148 via svnmerge from

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

................
  r339148 | lmadsen | 2011-10-03 15:13:16 -0500 (Mon, 03 Oct 2011) | 14 lines

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

  ........
    r339147 | lmadsen | 2011-10-03 15:12:43 -0500 (Mon, 03 Oct 2011) | 6 lines

    Remove duplicated Maxforwards line in AMI output.

    (Closes issue ASTERISK-18637)
    Reported by: Jacek Konieczny
    Patches:
         asterisk-sipshowpeer.patch (License #6298) uploaded by Jacek Konieczny
  ........
................

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