Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4222f8187991e1aa5e15fc2e8812cf77d9f63c64..a1d7f0013b350727468462f7693e47b8e381610f 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-13  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/ange-ftp.el (ange-ftp-make-directory): Don't raise an error,
+       if DIR exists and PARENTS is non-nil.
+
 2013-02-13  Juanma Barranquero  <lekktu@gmail.com>
 
        * progmodes/js.el (js--multi-line-declaration-indentation):