Merge from emacs-24; up to r117546
commit625d7cc9805700930eaf799d8207f43d8f559aaa
authorGlenn Morris <rgm@gnu.org>
Fri, 3 Oct 2014 16:07:31 +0000 (3 09:07 -0700)
committerGlenn Morris <rgm@gnu.org>
Fri, 3 Oct 2014 16:07:31 +0000 (3 09:07 -0700)
treeb49c70db6c18c9d552d9f2f07b0a68f689c8aa5e
parentf297fced4e9507c05531f7815d329435e80e8d85
parent158b0e85196f1545998f87985b1ab0f35f72a859
Merge from emacs-24; up to r117546
lisp/ChangeLog
lisp/org/ChangeLog