[asterisk-commits] dvossel: trunk r291195 - in /trunk: ./ CHANGES

[SVN commits to the Asterisk project]

Author: dvossel
Date: Mon Oct 11 16:44:34 2010
New Revision: 291195

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

........
  r291194 | dvossel | 2010-10-11 16:44:04 -0500 (Mon, 11 Oct 2010) | 2 lines
  
  Update CHANGES to reflect new gtalk.conf options.
........

Modified:
    trunk/   (props changed)
    trunk/CHANGES

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

Modified: trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/trunk/CHANGES?view=diff&rev=291195&r1=291194&r2=291195
==============================================================================
--- trunk/CHANGES (original)
+++ trunk/CHANGES Mon Oct 11 16:44:34 2010
@@ -106,6 +106,12 @@
    to none.
  * PacketCable NCS 1.0 support has been added for Docsis/Eurodocsis Networks.
    See configs/res_pktccops.conf for more information.
+
+XMPP Google Talk/Jingle changes
+-------------------------------
+  * Added the externip option to gtalk.conf.
+  * Added the stunaddr option to gtalk.conf which allows for the automatic
+    retrieval of the external ip from a stun server.
 
 Applications
 ------------