Merge changes from emacs-24; up to 2012-04-26T02:03:19Z!ueno@unixuser.org

[gnu-emacs] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ddc8f9b5a7e14be1207dfb6ae5891cc7a621a236..30bdefac5bf6f85ac53a94732d66c8d0463f2953 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-13  Glenn Morris  <rgm@gnu.org>
+
+       * international/mule-cmds.el (mule-menu-keymap)
+       (set-language-environment, set-locale-environment): Doc tweaks.
+
 2012-06-16  Aurelien Aptel  <aurelien.aptel@gmail.com>
 
        * cus-face.el (custom-face-attributes): Add wave-style underline