Merge from emacs-23

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 1e3373df6df9b34a7d114067f6f59e93a18e9da5..6cbeb7aa889eddfb62f43f0644d6ed921d45e688 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2010-11-09  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * .dir-locals.el (log-edit-mode): Set log-edit-rewrite-fixes.
+
+2010-11-09  Michael Albinus  <michael.albinus@gmx.de>
+
+       * configure.in: Don't write a warning for D-Bus anymore.
+
 2010-11-06  Andreas Schwab  <schwab@linux-m68k.org>
 
        * configure.in: Fix indentation.