Merge from origin/emacs-24
commitb6964cb031b5aa25c34b06ba77540ab06fab2005
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Feb 2015 06:51:59 +0000 (25 22:51 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 26 Feb 2015 06:51:59 +0000 (25 22:51 -0800)
tree1d21d7e8d22c758fe17f2b61241200ea757b1171
parent48598095b3b777dfaa80fd85ba8246de6e18b3cd
parent9ee2d9f92a9097c468fb4e938a14b2f569feb453
Merge from origin/emacs-24

The following commit was skipped:

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