# HG changeset patch
# User Juanma Barranquero <lekktu@gmail.com>
# Date 1168442891 0
# Node ID c32f72e1bece05202398c989353146b989570adb
# Parent  de505aec360d0101843dd92365538dcfd5e0a0e6
*** empty log message ***

diff -r de505aec360d -r c32f72e1bece lisp/ChangeLog
--- a/lisp/ChangeLog	Wed Jan 10 15:25:15 2007 +0000
+++ b/lisp/ChangeLog	Wed Jan 10 15:28:11 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-10  Juanma Barranquero  <lekktu@gmail.com>
+
+	* ediff-init.el (ediff-autostore-merges):
+	* textmodes/fill.el (fill-region): Doc fix.
+
 2007-01-10  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* server.el (server-ensure-safe-dir): UIDs may be floats.