Blocked revisions 178300 via svnmerge

Blocked revisions 178300 via svnmerge

........
  r178300 | dvossel | 2009-02-24 11:42:37 -0600 (Tue, 24 Feb 2009) | 14 lines

  Allows manager command to see if IAX link is trunked and encrypted. Displays what kind of encryption is enabled as well.

  Manager command "iaxpeers" now shows if a link is trunked and encrypted.  Instead of encryption saying simply "yes" or "no", it now displays what type of encryption is enabled and if keyrotation is on or not.

  (closes issue #14427)
  Reported by: snuffy
  Patches:
  	iax_show_trunks.diff uploaded by snuffy (license 35)
  	2009022200_iax2_show_trunkencryption.diff.txt uploaded by mvanbaak (license 7)
  Tested by: mvanbaak, dvossel, snuffy
........

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