Merged revisions 376219 via svnmerge from

Merged revisions 376219 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk

........
  r376219 | jrose | 2012-11-13 13:42:13 -0600 (Tue, 13 Nov 2012) | 12 lines

  chan_sip: Add SubscribeContext field to SIPshowpeer AMI response

  The new field is will show up within the response if the requested peer has a
  subscribe context set.

  (closes issue ASTERISK-20626)
  Reported by: Jaco Kroon
  Patches:
      asterisk-sip-ami-SubscrContext.patch uploaded by jkroon (license 5671)
          -with modifications by jrose to conform to style guidelines
  Review: https://reviewboard.asterisk.org/r/2195/
........

git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376224 65c4cc65-6c06-0410-ace0-fbb531ad65f3