Merge from emacs-24; up to 117669
commit1caf9dc67abd17fda5254ff84a7148db01eb105f
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Nov 2014 05:04:30 +0000 (4 21:04 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Nov 2014 05:04:30 +0000 (4 21:04 -0800)
treef5f53ab05b03a7b3234d187a30817145fb5d99da
parent161ec988651c4fb3a103dc58921b2748a719c887
Merge from emacs-24; up to 117669
12 files changed:
.dir-locals.el
Makefile.in
lisp/cedet/pulse.el
lisp/emacs-lisp/autoload.el
lisp/emacs-lisp/trace.el
lisp/erc/erc-menu.el
lisp/finder.el
lisp/gnus/gnus-uu.el
lisp/mail/unrmail.el
lisp/play/gamegrid.el
lisp/shadowfile.el
lisp/vc/vc.el