Merge from emacs-24; up to r117589
commit345d9e51107de690cdaeab6a7ba7e14dba38e51e
authorGlenn Morris <rgm@gnu.org>
Thu, 16 Oct 2014 01:49:34 +0000 (15 21:49 -0400)
committerGlenn Morris <rgm@gnu.org>
Thu, 16 Oct 2014 01:49:34 +0000 (15 21:49 -0400)
tree68483ee2722513aa26b6c5443549991fd23bca9c
parentf66dde49496308a71f81f053f3014a178dfc1273
parente462618f562ea3bab7883ebd616012606fcdf298
Merge from emacs-24; up to r117589
lisp/ChangeLog
lisp/ChangeLog.16