Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 382-398)

   - Update from CVS
   - Update from erc--emacs--22
   - Fix ERC bug introduced in last patch
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 123-125)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-101

1 files changed, 22 insertions, 1 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index ae887b33da9..32d7525e153 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,24 @@
+2006-08-15  Carsten Dominik  <dominik@science.uva.nl>
+
+        * orgcard.tex: Version number change.
+
+2006-08-12  Werner Lemberg  <wl@gnu.org>
+
+        * TUTORIAL.de: Synchronize with TUTORIAL.
+
+2006-08-10  Romain Francoise  <romain@orebokech.com>
+
+        * NEWS: Mention that zone-mode.el is now obsolete.
+
+2006-08-09  Richard Stallman  <rms@gnu.org>
+
+        * TUTORIAL: Don't say which side scroll bar is on.
+
+2006-08-06  Nick Roberts  <nickrob@snap.net.nz>
+
+        * DEBUG (Note): Add note about following a longjmp call.
+        Add local variables list for outline mode.
+
 2006-08-03  Michael Olson  <mwolson@gnu.org>
 
         * ERC-NEWS: Update for ERC 5.1.4.
@@ -186,7 +207,7 @@
 
 2006-05-29  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
-        * NEWS: Mention F10 for Gtk+/Leddtif/Lucid menus.
+        * NEWS: Mention F10 for Gtk+/Lesstif/Lucid menus.
 
 2006-05-26  Eli Zaretskii  <eliz@gnu.org>