Merge from emacs-24; up to 2012-04-21T14:12:27Z!sdl.web@gmail.com

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index f3bb51500dda14253e236a97cb296c71c86fce33..ffd9f7d31f6b14dc72b7c1efa9da97964c41723a 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,7 +1,28 @@
+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
+       spawns multiple lines then it will correctly indented.
+
 2012-04-20  Glenn Morris  <rgm@gnu.org>
 
+       * CONTRIBUTE: Expand a bit on copyright assignments.
+
        * 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>