Merge from emacs-24 branch

[gnu-emacs] / etc / ChangeLog

diff --git a/etc/ChangeLog b/etc/ChangeLog
index d69d066f2923e98c68b34d6116070449eec9f341..f2cdfb83c44f934b5169829bb2a34b3846521895 100644 (file)
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -4,6 +4,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>