auto upstream

1 files changed, 33 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 81b4978dba5..c895bce1cad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2012-12-30  Glenn Morris  <rgm@gnu.org>
+
+        * net/mairix.el (rmail, rmail-summary-displayed, rmail-summary):
+        Remove unnecessary/buggy autoloads (missing interactive).  (Bug#13294)
+        (rmail-summary-displayed, rmail-summary): Declare.
+        (mairix-rmail-display): Just require rmail.
+
+2012-12-30  Chong Yidong  <cyd@gnu.org>
+
+        * emacs-lisp/package.el (package-untar-buffer): Improve integrity
+        check for the tarball contents.
+
+2012-12-30  Matt Fidler  <matt.fidler@alcon.com>  (tiny change)
+
+        * emacs-lisp/package.el (package-untar-buffer): Handle problematic
+        tarfile content listings (Bug#13136).
+
+2012-12-30  Mark Lillibridge  <mark.lillibridge@hp.com>
+
+        * mail/rmailmm.el (rmail-insert-mime-forwarded-message): Insert
+        the undecoded text of the message being forwarded.  (Bug#9521)
+
+2012-12-30  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-set-file-uid-gid): Convert UID and GID to
+        integers, if they are real numbers.  (Bug#13282)
+
+        * net/tramp-sh.el (tramp-sh-handle-set-file-selinux-context):
+        Return `t' on success.
+
+        * net/tramp-smb.el (tramp-smb-file-name-handler-alist): Add
+        handler for `set-file-selinux-context'.
+
 2012-12-29  Michael Albinus  <michael.albinus@gmx.de>
 
         * net/tramp-sh.el (tramp-sh-handle-file-acl): Suppress basic attributes.