Merge from emacs-24; up to 2012-12-17T11:17:34Z!rgm@gnu.org

[gnu-emacs] / lisp / gnus / ChangeLog

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 56ec2ed50c861fed55607979855dc5d20178b204..4c27eea1602138b9779bda092d0c44b11a386b6f 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2013-02-10  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * nnir.el ("nnir"): Add 'virtual ability to nnir backend.  (This was
+       done in 2012-07-22 by Andrew Cohen, but I reverted it mistakenly.)
+
 2013-02-07  Gábor Vida  <gabor.v.vida@ericsson.com>  (tiny change)
 
        * auth-source.el (auth-source-format-prompt): Don't get confused by
@@ -1454,7 +1459,7 @@
        (nnimap-request-move-article): Delete the message from the correct IMAP
        server.
 
-2012-02-19  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
+2012-02-19  Gábor Vida  <vidagabor@gmail.com>  (tiny change)
 
        * gnus-demon.el (gnus-demon-init): Don't multiply time twice.
        Reported by Peter Münster.
@@ -1664,7 +1669,7 @@
        * shr.el (shr-browse-url): Fix the name of the `browse-url-mail'
        function call.
 
-2012-01-27  Vida Gábor  <vidagabor@gmail.com>  (tiny change)
+2012-01-27  Gábor Vida  <vidagabor@gmail.com>  (tiny change)
 
        * gnus-demon.el (gnus-demon-run-callback, gnus-demon-init): Convert to
        seconds, and make the repeat clause with HH:MM specs work as