Merge from origin/emacs-24

[gnu-emacs] / lisp / gnus / ChangeLog

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 762e3e7e0d0d6365db324e1c1e6fb210a603590e..4903796a7ff6749dbf9a72786f1aad32bb18f5b3 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-23  Ben Bacarisse  <ben.lists@bsb.me.uk>  (tiny change)
+
+       * nnmh.el (nnmh-request-expire-articles):
+       Work for the case nnmail-expiry-target is an nnmh group (bug#20170).
+
 2015-03-21  Eric Abrahamsen  <eric@ericabrahamsen.net>
 
        * registry.el (registry-lookup-secondary, registry-full)