Merge from emacs-24; up to 117669
commit2accd56f0563711e06192ec68cb33e14666fa91f
authorGlenn Morris <rgm@gnu.org>
Wed, 5 Nov 2014 05:08:57 +0000 (4 21:08 -0800)
committerGlenn Morris <rgm@gnu.org>
Wed, 5 Nov 2014 05:08:57 +0000 (4 21:08 -0800)
tree6f60cf8bc5fb2b99a8f93f138911e337eed25f0d
parent68790d7620cdb767b6a692d626eabd746759766e
parent17e1c0ffaebeff6ff5a7c756e235a5c4eecb872d
Merge from emacs-24; up to 117669
ChangeLog
lisp/ChangeLog
lisp/erc/ChangeLog
lisp/erc/erc.el
lisp/jit-lock.el
lisp/mail/emacsbug.el