Merged revisions 334007 via svnmerge from

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

................
  r334007 | kmoore | 2011-08-31 10:19:30 -0500 (Wed, 31 Aug 2011) | 14 lines

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

  ........
    r334006 | kmoore | 2011-08-31 10:18:37 -0500 (Wed, 31 Aug 2011) | 7 lines

    Correct an AMI protocol violation with SIPshowpeer

    The response of SIPshowpeer ends with "\r\n\r\n". Since other commands are
    ended by using \r\n this confuses any interfacing script.

    (closes issue ASTERISK-17486)
  ........
................

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