-<<<<<<< TREE
-2008-01-24 Michael Sperber <sperber@deinprogramm.de>
+2008-02-27 David Engster <dengste@eml.cc>
- * mail-source.el (mail-sources): Add `group' choice.
+ * nnmairix.el (nnmairix-request-group-with-article-number-correction):
+ Express real group name in the response.
- * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
- parameter `in-group' to control into which group the articles go.
- Add treatment of `group' mail-source.
+2008-02-27 Katsumi Yamaoka <yamaoka@jpl.org>
-=======
-2008-01-24 Michael Sperber <sperber@deinprogramm.de>
+ * nnmairix.el (nnmairix-group-regexp, nnmairix-valid-backends)
+ (nnmairix-last-server, nnmairix-current-server): Defvar them.
+ (nnmairix-goto-original-article): Defvar gnus-registry-install and
+ autoload gnus-registry-fetch-group when compiling.
+ (nnmairix-request-group-with-article-number-correction): remove
+ unreferenced argument passed to nnmairix-call-backend.
- * mail-source.el (mail-sources): Add `group' choice.
+2008-02-27 Reiner Steib <Reiner.Steib@gmx.de>
- * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
- parameter `in-group' to control into which group the articles go.
- Add treatment of `group' mail-source.
+ * mm-uu.el (mm-uu-type-alist): Fix message-marks non-hide arguments.
+ (mm-uu-extract): Improve face for low color ttys. Reported by Sascha
+ Wilde.
+
+2008-02-26 David Engster <dengste@eml.cc>
+
+ * nnmairix.el: New file. Mairix back end for Gnus. Initial import of
+ version 0.5.
+
+2008-02-26 Teodor Zlatanov <tzz@lifelogs.com>
+
+ * gnus-registry.el (gnus-registry-register-message-ids): Use `id'
+ instead of making an extra function call. Don't add the current group
+ to articles only when they have the group. Use
+ `gnus-registry-fetch-groups' instead of `gnus-registry-fetch-group'.
+ Reported by David <de_bb@arcor.de>.
+
+2008-02-20 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * lpath.el: Fbind pgg-display-output-buffer for systems in which EasyPG
+ has been installed; bind pgg-parse-crc24 for only non-Mule XEmacs.
+
+2008-02-16 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * mail-source.el (mail-source-delete-incoming): Change default.
+ Supplement doc string.
+
+ * gnus-util.el (gnus-y-or-n-p, gnus-y-or-n-p): Update comments.
+
+2008-02-14 Glenn Morris <rgm@gnu.org>
+
+ * calendar/time-date.el (format-seconds): New function.
+
+2008-02-14 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * nnmail.el (nnmail-message-id-cache-file): Derive from
+ `gnus-home-directory'.
+
+2008-02-11 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * gnus-topic.el (gnus-topic-select-group, gnus-topic-read-group):
+ Document negativ prefix.
+
+ * gnus-group.el (gnus-group-read-group): Document negativ prefix.
+
+2008-02-10 Lars Magne Ingebrigtsen <larsi@gnus.org>
+
+ * message.el (message-unsent-separator): Add the Exim bounce
+ separator.
+
+2008-02-10 Daiki Ueno <ueno@unixuser.org>
+
+ * mml2015.el (mml2015-epg-sign): Remove skipped signers from the signer
+ list.
+ (mml2015-epg-encrypt): Remove skipped recipients/signers from the
+ recipient/signer list.
-2008-01-24 Dan Nicolaescu <dann@ics.uci.edu>
+2008-02-07 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * Makefile.in (datarootdir): Define.
+ (EMACS_COMP, install-el, install-elc, install-el-elc): Quote directory
+ name that might contain whitespace.
+
+2008-02-10 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * mm-util.el (mm-codepage-setup): If cp-supported-codepages isn't
+ fbound (Emacs 23 unicode), signal an error.
+
+2008-02-08 Glenn Morris <rgm@gnu.org>
+
+ * gnus-art.el (pgg-display-output-buffer): Declare as function.
+
+2008-02-07 Tassilo Horn <tassilo@member.fsf.org>
+
+ * nnimap.el (nnimap-open-connection): Add "143" and "993" as default
+ ports to the calls to `netrc-machine-user-or-password' in addition to
+ "imap" and "imaps".
+
+2008-02-01 Zhang Wei <id.brep@gmail.com>
+
+ * rfc2047.el (rfc2047-charset-encoding-alist): Add gbk and GB18030.
+
+ * mm-util.el (mm-mime-mule-charset-alist): Add gbk and GB18030.
+
+2008-02-01 Kenichi Handa <handa@m17n.org>
+
+ * rfc2104.el (rfc2104-hexstring-to-byte-list): Renamed from
+ rfc2104-hexstring-to-bitstring and changed to return a byte list.
+ (rfc2104-hash): Convert the result of concat to unibyte string.
+
+2008-02-01 Dave Love <fx@gnu.org>
+
+ * gnus-start.el (gnus-read-newsrc-el-file): Don't bind
+ coding-system-for-read.
+ (gnus-gnus-to-quick-newsrc-format): Insert coding cookie.
+
+2008-02-03 Reiner Steib <Reiner.Steib@gmx.de>
+
+ * gnus.el (gnus-group-startup-message): Add `find-image' call before
+ image-load-path is let-bound. Reported by Harald Hanche-Olsen
+ <hanche@math.ntnu.no>.
+
+2008-02-01 Katsumi Yamaoka <yamaoka@jpl.org>
+
+ * gnus-art.el (gnus-article-describe-bindings): Work for draft group.
+
+ * gnus-xmas.el (gnus-xmas-article-describe-bindings): Ditto.
+
+2008-01-28 Dan Nicolaescu <dann@ics.uci.edu>
* sieve.el (sieve-make-overlay, sieve-overlay-put, sieve-overlays-at):
* message.el (message-beginning-of-line): Use featurep instead of bound
tests in order to resolve conditionals at compile time.
->>>>>>> MERGE-SOURCE
+2008-01-24 Michael Sperber <sperber@deinprogramm.de>
+
+ * mail-source.el (mail-sources): Add `group' choice.
+
+ * nnmail.el (nnmail-get-new-mail-1): Abstract this out to add another
+ parameter `in-group' to control into which group the articles go.
+ Add treatment of `group' mail-source.
+
2008-01-23 Katsumi Yamaoka <yamaoka@jpl.org>
* gnus-art.el (gnus-insert-mime-button): Don't decode description.