[Asterisk-cvs] asterisk ChangeLog,1.98,1.99

[kpfleming]

Update of /usr/cvsroot/asterisk
In directory mongoose.digium.com:/tmp/cvs-serv10716

Modified Files:
	ChangeLog 
Log Message:
issue #5680


Index: ChangeLog
===================================================================
RCS file: /usr/cvsroot/asterisk/ChangeLog,v
retrieving revision 1.98
retrieving revision 1.99
diff -u -d -r1.98 -r1.99
--- ChangeLog	11 Nov 2005 00:35:20 -0000	1.98
+++ ChangeLog	11 Nov 2005 00:45:02 -0000	1.99
@@ -1,5 +1,7 @@
 2005-11-10  Kevin P. Fleming  <kpfleming at digium.com>
 
+	* apps/app_meetme.c (conf_run): don't restrict admin users from joining a locked conference (issue #5680)
+
 	* channels/chan_misdn.c: include stdio.h (issue #5671)
 	* channels/chan_misdn_config.c: fix prototype warning (issue #5671)