1 files changed, 11 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f3a84967aaf..72e8959d8ef 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2013-01-02  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-acl): Add argument to
+        `error' call.
+        (tramp-do-copy-or-rename-file): Ignore errors when calling
+        `set-file-extended-attributes'.
+
+        * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
+        handler for `file-acl'.
+        (tramp-smb-handle-file-acl): New defun.
+
 2013-01-02  Jay Belanger  <jay.p.belanger@gmail.com>
 
         * calc/README: Mention ISO 8601 week-numbering dates.