From: Lars Magne Ingebrigtsen <larsi@quimbies.gnus.org>
Date: Mon, 27 Sep 2010 19:01:27 +0000 (+0200)
Subject: Merge branch 'master' of https://git.gnus.org/gnus
X-Git-Url: https://cgit.sxemacs.org/?a=commitdiff_plain;h=a43e635ba3ee5c96cff15992a78c0c691ccc17d2;p=gnus

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

a43e635ba3ee5c96cff15992a78c0c691ccc17d2
diff --cc lisp/ChangeLog
index f52a13dea,fa0a8dd87..8fa8a1bec
--- a/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