# HG changeset patch
# User Paul Eggert <eggert@cs.ucla.edu>
# Date 1295757057 28800
# Node ID f3d87590137262ffac9669e0e1d0de23b04c85a6
# Parent  9de5a68b57e1dbe652edf00ccc26073ffeed8a26# Parent  473533159689b1bc983d46f5f9b05d7f0c9eda5a
Merge from mainline.

diff -r 9de5a68b57e1 -r f3d875901372 lisp/gnus/ChangeLog
--- a/lisp/gnus/ChangeLog	Sat Jan 22 18:56:06 2011 -0800
+++ b/lisp/gnus/ChangeLog	Sat Jan 22 20:30:57 2011 -0800
@@ -3,7 +3,7 @@
 	* gnus-sum.el (gnus-summary-move-article): Protect against backends
 	(i.e., nnimap) returning nil as the article number.
 
-2011-01-22  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>
+2011-01-22  Kazuhiro Ito  <kzhr@d1.dion.ne.jp>  (tiny change)
 
 	* flow-fill.el (fill-flowed): Make `delete-space' option correspond to
 	"DelSp" parameter in RFC3676.