Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru
commit259a0b6d3bc6ffe0d5d24368e415fa46f439a844
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)
treed398269f28c6015010388944afc225efa804b194
parent2ae68b8b152f7fcc987c9efd0eacf6b768703b71
parentcaafef5ddc019b2cd4030f71fb3f307c3775b4da
Merge from emacs-24; up to 2014-07-17T10:18:19Z!dmantipov@yandex.ru
lisp/ChangeLog
lisp/org/ChangeLog