Merge from emacs-24; up to 2012-04-24T21:47:24Z!michael.albinus@gmx.de

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 6eadd33b6a7a1e82257c45303235c7ce24f70e3a..167910f782f17cbeb9cec0549088e17e53c5f8ed 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,4 +1,18 @@
-2012-04-26  Jambunathan K  <kjambunathan@gmail.com>
+2012-05-31  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * PROBLEMS: Remove obsolete '#define static' cruft.
+
+2012-05-07  Glenn Morris  <rgm@gnu.org>
+
+       * forms/forms-d2.el, forms/forms-pass.el: Move here from ../lisp.
+       * forms/forms-d2.dat: Move to forms/ subdirectory.
+       * forms/README: New.
+
+2012-05-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * NEWS: Do not limit current-time-string to years 1000..9999.
+
+2012-04-27  Jambunathan K  <kjambunathan@gmail.com>
 
        * org/OrgOdtStyles.xml (OrgDescriptionList): Modify style.  With
        this change, in a description list, if the description paragraph
@@ -10,6 +24,9 @@
 
        * MORE.STUFF: General update.  Mention list-packages.
        Remove many old/outdated URLs.
+2012-04-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * publicsuffix.txt: New file (bug#1401).
 
 2012-04-02  Alan Mackenzie  <acm@muc.de>