merge from no gnus

diff --cc texi/ChangeLog
index 2771ecd,9ed122d..4af56cf
--- 1/texi/ChangeLog
--- 2/texi/ChangeLog
+++ b/texi/ChangeLog
@@@ -1,18 -1,8 +1,23 @@@
 +2012-02-06  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * message.texi (Mail Variables): Mention the optional user parameter
 +      for X-Message-SMTP-Method.
 +
 +2012-02-02  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus.texi (Posting Styles): Mention X-Message-SMTP-Method.
 +
 +      * message.texi (Mail Variables): Document X-Message-SMTP-Method.
 +
 +2012-01-31  Lars Ingebrigtsen  <larsi@gnus.org>
 +
 +      * gnus.texi (Key Index): Change encoding to utf-8.
 +
+ 2012-02-07  Lars Ingebrigtsen  <larsi@gnus.org>
+ 
+       * gnus.texi (Mail Source Specifiers): Add a pop3 via an SSH tunnel
+       example (modified from an example by Michael Albinus).
+ 
  2012-01-30  Philipp Haselwarter  <philipp.haselwarter@gmx.de>  (tiny change)
  
        * gnus.texi (Agent Basics): Fix outdated description of

diff --cc texi/gnus.texi
Simple merge