Merge from emacs-23; up to 2010-06-09T17:54:28Z!albinus@detlef.

[bpt/emacs.git] / doc / emacs / ChangeLog

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index c640501..3782538 100644 (file)
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,8 @@
+2011-04-23  Juanma Barranquero  <lekktu@gmail.com>
+
+       * mini.texi (Minibuffer Edit):
+       * screen.texi (Mode Line): Fix typo.
+
 2011-04-20  Christoph Scholtes  <cschol2112@googlemail.com>
 
        * maintaining.texi (Old Revisions): Mention new function vc-ediff.