Merge from emacs--devo--0

[gnus] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3550def..222825c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+<<<<<<< TREE
+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-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-24  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-23  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * gnus-art.el (gnus-insert-mime-button): Don't decode description.
+
+       * mm-decode.el (mm-dissect-buffer): Decode description.
+
+       * mml.el (mml-to-mime): Encode message header first.
+
 2008-01-18  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-article-describe-bindings): Make it possible to use