Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1340

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3b4f71b71b77c96e224a6ccd47fc7dabe1436e20..ff4e7abfd99aadc06ccff96debcab5aa279fdeab 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -67,10 +67,6 @@
        Use `gnus-put-display-table', `gnus-get-display-table',
        `gnus-set-display-table' for the display table, instead of `aset'.
 
-       * gnus-xmas.el (gnus-xmas-summary-set-display-table):
-       Use `gnus-put-display-table', `gnus-get-display-table',
-       `gnus-set-display-table' for the display table.
-
 2008-06-14  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * nnmairix.el: Add autoloads.