# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1204000059 0
# Node ID b14cdce74f4c77441e4d7c09705eb93d592c7339
# Parent  5f0de7ccefc4215119658b66d037763eb18df60d
Combine entries.

diff -r 5f0de7ccefc4 -r b14cdce74f4c lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Feb 26 02:06:33 2008 +0000
+++ b/lisp/ChangeLog	Tue Feb 26 04:27:39 2008 +0000
@@ -2,11 +2,6 @@
 
 	* doc-view.el (doc-view-current-page): Add a `win' argument.
 
-2008-02-25  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
-
-	* ibuffer.el (ibuffer-do-toggle-read-only): New optional arg as in
-	toggle-read-only.
-
 2008-02-25  Stefan Monnier  <monnier@iro.umontreal.ca>
 
 	* doc-view.el (doc-view-conversion-buffer): Give it an internal name.
@@ -26,12 +21,13 @@
 
 2008-02-25  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
 
+	* ibuffer.el (ibuffer-do-toggle-read-only): New optional arg as in
+	toggle-read-only.
+
 	* textmodes/bibtex.el (bibtex-format-entry): Handle error message
 	refering to a missing required field with the OPT prefix.
 	Make unwindform more robust.
 
-2008-02-25  Roland Winkler  <Roland.Winkler@physik.uni-erlangen.de>
-
 	* textmodes/bibtex.el: Remove support for hideshow minor mode as
 	it duplicates the bibtex support in progmodes/hideshow.el.
 	* progmodes/hideshow.el (hs-special-modes-alist): Allow bibtex