Merge from emacs-24; up to 117691
commitda95e2399e068eb87ea90a4617d80980d0601eb4
authorGlenn Morris <rgm@gnu.org>
Sun, 9 Nov 2014 02:06:29 +0000 (8 18:06 -0800)
committerGlenn Morris <rgm@gnu.org>
Sun, 9 Nov 2014 02:06:29 +0000 (8 18:06 -0800)
tree4c2b9ac861c7f37d14950c199dda17dd38226955
parent90a1373b4c8e3f646b2b75cb4a12126cd361faa0
parente4ed201ff9e089d8a074523ca7de02c1b84bece2
Merge from emacs-24; up to 117691
admin/ChangeLog
doc/emacs/ChangeLog
doc/emacs/Makefile.in
doc/lispintro/ChangeLog
doc/lispintro/Makefile.in
doc/lispref/ChangeLog
doc/lispref/Makefile.in
doc/misc/ChangeLog
doc/misc/Makefile.in