Merge from origin/emacs-24

[gnu-emacs] / doc / lispref / ChangeLog

diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 260656c6cf76fff62e8bbd1b4f4c71d26ae391b1..3644d40fabf69162e8503be9204d94ef7b8acafd 100644 (file)
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,3 +1,7 @@
+2015-03-18  Eli Zaretskii  <eliz@gnu.org>
+
+       * minibuf.texi (Basic Completion): Fix a typo.  (Bug#20108)
+
 2015-03-09  Nicolas Petton <nicolas@petton.fr>
 
        * sequences.texi (seq-into): Add documentation for the new