merge bugfix from ries

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a5606ebc78550025cb0fe232d8606a25d62861bf..3c8ee17bd556611d200c550894dd81a2827fbf31 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2007-06-19  Anthony Towns  <ajt@debian.org>
+
+       * Add nm.debian.org pseudopackage
+
 2007-06-18  Anthony Towns  <ajt@debian.org>
 
        * daklib/logging.py: Set umask to not exclude group-writability
@@ -9,7 +13,10 @@
        priority of a source override; never set priority of source
        overrides; correct typo in logging (s/priority/section/ at
        one place)
+
        * config/debian/apt.conf.oldstable: Added for oldstable point releases.
+       * config/debian/cron.daily: auotmatically accept/reject
+       oldstable-proposed-updates based on COMMENTS directory
 
 2007-06-18  Anthony Towns  <ajt@debian.org>