[asterisk-commits] irroot: trunk r337283 - in /trunk: ./ configs/sip.conf.sample

[SVN commits to the Asterisk project]

Author: irroot
Date: Wed Sep 21 06:21:49 2011
New Revision: 337283

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=337283
Log:
Merged revisions 337263 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r337263 | irroot | 2011-09-21 13:15:48 +0200 (Wed, 21 Sep 2011) | 1 line
  
  Whitespace fixup from SRTP patch
........

Modified:
    trunk/   (props changed)
    trunk/configs/sip.conf.sample

Propchange: trunk/
------------------------------------------------------------------------------
Binary property 'branch-10-merged' - no diff available.

Modified: trunk/configs/sip.conf.sample
URL: http://svnview.digium.com/svn/asterisk/trunk/configs/sip.conf.sample?view=diff&rev=337283&r1=337282&r2=337283
==============================================================================
--- trunk/configs/sip.conf.sample (original)
+++ trunk/configs/sip.conf.sample Wed Sep 21 06:21:49 2011
@@ -904,7 +904,7 @@
 ;encryption=no                  ; Whether to offer SRTP encrypted media (and only SRTP encrypted media)
                                 ; on outgoing calls to a peer. Calls will fail with HANGUPCAUSE=58 if
                                 ; the peer does not support SRTP. Defaults to no.
-;encryption_taglen=80              ; Set the auth tag length offered in the INVITE either 32/80 default 80
+;encryption_taglen=80           ; Set the auth tag length offered in the INVITE either 32/80 default 80
 
 ;----------------------------------------- REALTIME SUPPORT ------------------------
 ; For additional information on ARA, the Asterisk Realtime Architecture,