Merge from emacs-24; up to 2012-05-08T14:11:47Z!monnier@iro.umontreal.ca

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index 85a4c82906309efb41fa04ab9fcf5b3d860a756e..396240bb7b8d873b9163547ba6ce4c876ad9d169 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,7 @@
+2012-10-05  Ikumi Keita  <ikumi@ikumi.que.jp>  (tiny change)
+
+       * minibuf.c (Fcompleting_read): Doc fix.  (Bug#12555)
+
 2012-10-04  Eli Zaretskii  <eliz@gnu.org>
 
        * w32.c (utime): Test for INVALID_HANDLE_VALUE, not for NULL, to