Merge remote branch 'origin/no-gnus'

diff --cc texi/ChangeLog
index be92527,adc0f43..b4cf8eb
--- 1/texi/ChangeLog
--- 2/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,8 -1,8 +1,13 @@@
 +2012-03-14  Christopher Schmidt  <christopher@ch.ristopher.com>
 +
 +      * gnus.texi (Archived Messages): Mention gnus-gcc-pre-body-encode-hook
 +      and gnus-gcc-post-body-encode-hook. 
 +
+ 2012-03-22  Peder O. Klingenberg  <peder@klingenberg.no>  (tiny change)
+ 
+       * gnus.texi (Archived Messages): Update `gnus-message-archive-group' to
+       reflect the new default.
+ 
  2012-02-28  Glenn Morris  <rgm@gnu.org>
  
        * gnus-faq.texi, gnus-news.texi, gnus.texi:

diff --cc texi/gnus.texi
Simple merge