From: Joakim Verona <joakim@verona.se>
Date: Sat, 15 Dec 2012 12:12:29 +0000 (+0100)
Subject: auto upstream
X-Git-Tag: emacs-25.0.90~3123
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c69b57e49b55064fca05150c90a396ca5cf4bde4;p=emacs.git

auto upstream
---

c69b57e49b55064fca05150c90a396ca5cf4bde4
diff --cc lisp/dired.el
index 1d6c667e1dd,1d6c667e1dd..93f302329e3
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@@ -4295,7 -4295,7 +4295,7 @@@ instead
  ;;;***
  
  ;;;### (autoloads (dired-do-relsymlink dired-jump-other-window dired-jump)
--;;;;;;  "dired-x" "dired-x.el" "a4e6844421c2c5e6fde90e959fbcc26f")
++;;;;;;  "dired-x" "dired-x.el" "a0a769bf895afcbb6d0e05169ef81923")
  ;;; Generated autoloads from dired-x.el
  
  (autoload 'dired-jump "dired-x" "\