Not-so-automated merge.

[wget] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d96ce3552e28057dadb989f4ae7ce26882d29f72..ac384a4966674c38f03f3b73b7dd6313fd9ef8a1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,23 @@
+2008-11-10  Micah Cowan  <micah@cowan.name>
+
+       * MAILING-LIST: Mention Gmane, introduce subsections.
+
+2008-11-05  Micah Cowan  <micah@cowan.name>
+
+       * MAILING-LIST: Mention moderation for unsubscribed posts, and
+       archive location.
+
+2008-10-31  Micah Cowan  <micah@cowan.name>
+
+       * MAILING-LIST: Update information.
+
+       * NEWS: Add mention of mailing list move.
+
+2008-08-01  Joao Ferreira  <joao@joaoff.com>
+
+       * NEWS: Added option --default-page to support alternative
+       default names for index.html
+
 2008-06-30  Micah Cowan  <micah@cowan.name>
 
        * NEWS: Entries for 1.11.4.