From: Paul Eggert <eggert@cs.ucla.edu>
Date: Thu, 26 Feb 2015 06:51:59 +0000 (-0800)
Subject: Merge from origin/emacs-24
X-Git-Tag: emacs-25.0.90~2564^2~285
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b6964cb031b5aa25c34b06ba77540ab06fab2005;p=emacs.git

Merge from origin/emacs-24

The following commit was skipped:

9ee2d9f [Backport] lisp/gnus/nnimap.el (nnimap-find-expired-articles): nnimap `never' expiration fix
---

b6964cb031b5aa25c34b06ba77540ab06fab2005