Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4b67d34b56a157b14f0a33f274b0741a3dac4a5..5bbfe1a6ff7a1f57186acbdd0736a5f1b0125464 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-09  Ulrich Mueller  <ulm@gentoo.org>
+
+       * descr-text.el (describe-char): Fix %d/%x typo.  (Bug#14360)
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
        * international/fontset.el (vertical-centering-font-regexp):