Merge from emacs-24; up to 117691
commit2cccd6181d64f0e32e7c93697c56516dc3ea67c2
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)
tree13541d930101594f267488b06e6ab43d2ddef2d5
parent40b2d8090501e0949caf94f0ffaa7dac8e4a7dde
parent21531bfe0af5d3e3d28853c4d69fa98d3ce62cc7
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