Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org
authorGlenn Morris <rgm@gnu.org>
Thu, 9 May 2013 02:44:12 +0000 (19:44 -0700)
committerGlenn Morris <rgm@gnu.org>
Thu, 9 May 2013 02:44:12 +0000 (19:44 -0700)
commit2d809ffafd3e1bde360c08f3be4b7d9a43ff5f0e
treeab0dbc4327f2dd4e6f8675e3f41cd2981b348c5b
parent56cd351d2b3fc858ce6cf82a68a99d2c2e24d157
parentb01682fbbe6b48fe34cb3d26932fd03e4b0669e5
Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org
doc/emacs/ChangeLog
doc/emacs/trouble.texi
lisp/ChangeLog
lisp/descr-text.el