From: Gregory Nietsky <gregory@distrotech.co.za>
Date: Mon, 3 Oct 2011 14:40:57 +0000 (+0000)
Subject: Merged revisions 338997 via svnmerge from
X-Git-Tag: 11.0.0-beta1~1083
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7b26fde494076f0b67ba5c7fa4a25b970be2ae2a;p=thirdparty%2Fasterisk.git

Merged revisions 338997 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/10

........
  r338997 | irroot | 2011-10-03 16:38:25 +0200 (Mon, 03 Oct 2011) | 1 line

  Documentation noting the extension of CHANNEL() for chan_ooh323
........


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

diff --git a/CHANGES b/CHANGES
index 76a90165cc..bcc4beff11 100644
--- a/CHANGES
+++ b/CHANGES
@@ -156,6 +156,7 @@ Dialplan Functions
    user specifies or just throughout the whole string.
  * Added option to CHANNEL(pickupgroup) allow reading and setting the pickupgroup of channel.
  * Mark VALID_EXTEN() deprecated in favor of DIALPLAN_EXISTS()
+ * Added extensions to chan_ooh323 in function CHANNEL()
 
 libpri channel driver (chan_dahdi) DAHDI changes
 --------------------------