issues #3599 and #4252

git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7033 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 3 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d0d95cf1..f8026c076 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2005-11-08  Kevin P. Fleming  <kpfleming@digium.com>
+	
+	* apps/app_meetme.c: fix two audio delay problems related to using non-Zap channels in conferences (issues #3599 and #4252)
+	* configs/meetme.conf.sample: add documentation of new 'audiobuffers' setting to control buffering on incoming audio from non-Zap channels
 
 	* channels/chan_local.c (local_call): move channel variables from incoming to outgoing instead of inheriting them (issue #5604)