Merged revisions 292309 via svnmerge from
authorTerry Wilson <twilson@digium.com>
Tue, 19 Oct 2010 19:35:24 +0000 (19:35 +0000)
committerTerry Wilson <twilson@digium.com>
Tue, 19 Oct 2010 19:35:24 +0000 (19:35 +0000)
commit9653b5d500c12bb5a60b4ad244706c15d20523f2
tree0037d4734f95f1a9e566102307370bd44a506297
parent14f4edcf750b1d48210b0c5b3af6552708903bc2
Merged revisions 292309 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.8

........
  r292309 | twilson | 2010-10-19 12:27:32 -0700 (Tue, 19 Oct 2010) | 10 lines

  Add sip show peer info about crypto and remove dated comment

  This patch adds information about the encryption setting to 'sip show
  peers' and removes an out-of-date comment from res_srtp.c and instead
  directs users to the proper documentation.

  (closes issue #18140)
  Reported by: chodorenko
........

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