show-deferred: handle uploads that do not close bugs

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3c68e7580e29a6451320ccbe0ab03bb5a34ad14d..f5bb34afde88e23c2b5018d34eef941e35340626 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-11-15  Thomas Viehmann <tv@beamnet.de>
+
+       * dak/show_deferred.py: handle uploads that do not close bugs
+
 2008-11-11  Joerg Jaspert  <joerg@debian.org>
 
        * config/debian/dak.conf: good bye oldstable/o-p-u
@@ -557,6 +561,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>