[asterisk-commits] pabelanger: branch 1.6.2 r291939 - in /branches/1.6.2: ./ configs/

[SVN commits to the Asterisk project]

Author: pabelanger
Date: Fri Oct 15 14:35:20 2010
New Revision: 291939

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

........
  r291938 | pabelanger | 2010-10-15 15:30:41 -0400 (Fri, 15 Oct 2010) | 2 lines
  
  Clean up formatting.
........

Modified:
    branches/1.6.2/   (props changed)
    branches/1.6.2/configs/gtalk.conf.sample

Propchange: branches/1.6.2/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Modified: branches/1.6.2/configs/gtalk.conf.sample
URL: http://svnview.digium.com/svn/asterisk/branches/1.6.2/configs/gtalk.conf.sample?view=diff&rev=291939&r1=291938&r2=291939
==============================================================================
--- branches/1.6.2/configs/gtalk.conf.sample (original)
+++ branches/1.6.2/configs/gtalk.conf.sample Fri Oct 15 14:35:20 2010
@@ -1,20 +1,18 @@
 ;[general]
-;context=default		;;Context to dump call into
-;bindaddr=0.0.0.0		;;Address to bind to
-;allowguest=yes			;;Allow calls from people not in
-				;;list of peers
-;
-;[guest]			;;special account for options on guest account
-;disallow=all				
+;context=default		; Context to dump call into
+;bindaddr=0.0.0.0		; Address to bind to
+;allowguest=yes			; Allow calls from people not in list of peers
+
+;[guest]			; special account for options on guest account
+;disallow=all
 ;allow=ulaw
 ;context=guest
-;
+
 ;[ogorman]
-;username=ogorman at gmail.com	;;username of the peer your 
-				;;calling or accepting calls from
+;username=ogorman at gmail.com	; username of the peer your 
+				; calling or accepting calls from
 ;disallow=all
 ;allow=ulaw
-;context=default		
-;connection=asterisk		;;client or component in jabber.conf
-				;;for the call to leave on.
-;
+;context=default
+;connection=asterisk		; client or component in jabber.conf for the
+				; call to leave on.