Merge from emacs-24; up to r117555
commite10449d6685fa0656afa39514c599ec1e52f02a3
authorGlenn Morris <rgm@gnu.org>
Sun, 5 Oct 2014 17:19:23 +0000 (5 10:19 -0700)
committerGlenn Morris <rgm@gnu.org>
Sun, 5 Oct 2014 17:19:23 +0000 (5 10:19 -0700)
tree3609ee4aa1349a54bb2a9f688698a1d88017de8a
parent9f02cbc48270166af2ea0c99a51c25b0036b7910
parentba1a7d65d99007e9a39e7036e54e5c4187e9e41f
Merge from emacs-24; up to r117555
doc/emacs/ChangeLog
doc/emacs/misc.texi
lisp/ChangeLog