Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca
commit249635f0dfb22bcae4c7134e95f01640a6a0d149
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)
tree35ee0c4874f81c26a0d2d8ed17eb451f2b3d964b
parent6e604a82a0f8dad3a55c54cf8b64ef2d38106f5b
parentc938c07bf3505a6d418678a04ff24f25d9039160
Merge from emacs-24; up to 2014-07-21T01:34:03Z!monnier@iro.umontreal.ca
doc/emacs/ChangeLog
doc/emacs/misc.texi
lisp/ChangeLog