Merge from emacs-24; up to 2012-12-25T15:07:59Z!dmantipov@yandex.ru
authorGlenn Morris <rgm@gnu.org>
Fri, 8 Mar 2013 08:04:30 +0000 (00:04 -0800)
committerGlenn Morris <rgm@gnu.org>
Fri, 8 Mar 2013 08:04:30 +0000 (00:04 -0800)
1  2 
lisp/org/ChangeLog

Simple merge