Merge branch 'master' of https://git.gnus.org/gnus

Conflicts:
	lisp/ChangeLog

diff --cc lisp/ChangeLog
index f48be7b,be7c0a9..0e1651f
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,7 -1,8 +1,12 @@@
 +2010-11-17  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * shr.el (shr-put-image): Break lines when inserting big pictures.
 +
+ 2010-11-17  Andrew Cohen  <cohen@andy.bu.edu>
+ 
+       * nnir.el (nnir-run-imap): Reverse the article list for each group
+       rather than the whole list.
+ 
  2010-11-17  Katsumi Yamaoka  <yamaoka@jpl.org>
  
        * shr.el (shr-image-displayer): Protect function against non-existent