From 3e6c19a83720785f6305270d3288478d78d8bcd5 Mon Sep 17 00:00:00 2001
From: David Vossel <dvossel@digium.com>
Date: Mon, 11 Oct 2010 21:44:34 +0000
Subject: 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.
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@291195 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---
 CHANGES | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'CHANGES')

diff --git a/CHANGES b/CHANGES
index 64f104832..4b4206e21 100644
--- a/CHANGES
+++ b/CHANGES
@@ -107,6 +107,12 @@ MGCP Changes
  * 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
 ------------
  * Added 'p' option to PickupChan() to allow for picking up channel by the first
-- 
cgit v1.2.3