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

Conflicts:
	texi/ChangeLog
	texi/gnus.texi

diff --cc texi/ChangeLog
index b1c11bb,c0c35d0..926511b
--- 1/texi/ChangeLog
--- 2/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,24 -1,7 +1,28 @@@
 +2011-02-04  Teodor Zlatanov  <tzz@lifelogs.com>
 +
 +      * overrides.texi: New file to set or clear WEBHACKDEVEL.
 +
 +      * sieve.texi: Use WEBHACKDEVEL.
 +
 +      * sasl.texi: Use WEBHACKDEVEL.
 +
 +      * pgg.texi: Use WEBHACKDEVEL.
 +
 +      * message.texi: Use WEBHACKDEVEL.
 +
 +      * gnus.texi: Use WEBHACKDEVEL.
 +
 +      * emacs-mime.texi: Use WEBHACKDEVEL.
 +
 +      * auth.texi: Use WEBHACKDEVEL.
 +
 +      * Makefile.in (webhack, nowebhack): Hacks to produce for-the-web
 +      manuals.
 +
+ 2011-02-04  Lars Ingebrigtsen  <larsi@gnus.org>
+ 
+       * gnus.texi: Add DEVEL header (suggested by Andreas Schwab).
+ 
  2011-02-03  Lars Ingebrigtsen  <larsi@gnus.org>
  
        * gnus.texi (Article Date): Remove mention of gnus-stop-date-timer,