Merge changes made in Gnus trunk
commit18cd34c10ed8511b51564b7bad9fb627058ab9cf
authorLars Ingebrigtsen <larsi@gnus.org>
Thu, 26 Jan 2012 10:43:01 +0000 (26 10:43 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Thu, 26 Jan 2012 10:43:01 +0000 (26 10:43 +0000)
tree4d6ef3f21512dba3ef4ce75ec3f96bd3687de17f
parentd1caca805e681fd25e9c349aa30ddf7ead9c25ec
Merge changes made in Gnus trunk

nnimap.el (nnir-search-thread): Autoload to avoid a compilation warning.
gnus-sum.el (gnus-summary-line-format-alist): Don't try to macroexpand the nnir things, since they haven't been defined yet, and nnir requires gnus-sum.
lisp/gnus/ChangeLog
lisp/gnus/gnus-sum.el
lisp/gnus/nnimap.el