Merge from origin/emacs-24

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ed28911497a949b1de8c0954c129fc02eaea3d1e..fd7dcd31ffd5feacb80282689c05a905a831c199 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
+2015-03-09  Eli Zaretskii  <eliz@gnu.org>
+
+       * dired.el (dired-delete-file): Doc fix.  (Bug#20021)
 2015-03-06  Sergio Durigan Junior  <sergiodj@sergiodj.net>
            Thomas Fitzsimmons  <fitzsim@fitzsim.org>