Merge from emacs-24; up to 2012-04-24T08:35:02Z!lekktu@gmail.com

[gnu-emacs] / doc / misc / ChangeLog

diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index a10f65b085c15e84528bd9df97f34942620b4c56..82e6a2f70aec78028f4cc6674fb82da3ed13cd94 100644 (file)
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,7 +1,10 @@
+2012-05-27  Bastien Guerry  <bzg@gnu.org>
+
+       * org.texi (Durations and time values): Fix typo.
+
 2012-05-19  Jay Belanger  <jay.p.belanger@gmail.com>
 
-       * doc/misc/calc.texi
-       (Basic Operations on Units, Customizing Calc):
+       * doc/misc/calc.texi (Basic Operations on Units, Customizing Calc):
        Mention `calc-ensure-consistent-units'.
 
 2012-05-14  Andreas Schwab  <schwab@linux-m68k.org>