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

diff --cc lisp/ChangeLog
index f52a13d,fa0a8dd..8fa8a1b
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,11 -1,11 +1,17 @@@
+ 2010-09-27  David Engster  <dengste@eml.cc>
+ 
+       * nnmairix.el: (nnmairix-replace-group-and-numbers): Deal with NOV as
+       well as HEADERS.
+       (nnmairix-retrieve-headers): Provide new argument for the above.
+ 
  2010-09-27  Lars Magne Ingebrigtsen  <larsi@gnus.org>
  
 +      * gnus-sum.el (gnus-summary-move-article): Don't alter
 +      gnus-newsgroup-active.  This makes `/ N' work after copying to the same
 +      group.
 +
 +      * nnimap.el (nnimap-update-info): Don't destructively alter active.
 +
        * message.el (message-cite-prefix-regexp): Revert my last edit.
  
        * gnus-sum.el (gnus-summary-show-complete-article): Bind the server