Merge from emacs-24 branch

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 9353b617cb244e4dec0e67fb54506e36f6a54bb9..f2cdfb83c44f934b5169829bb2a34b3846521895 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,9 @@
+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).