Merge commit 'sec-merge' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 4ff8516ebe14fd0b9f04534bbe8ad4ac432fcc7b..05a17bc50864a5aa85db676c170410d1a4895820 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -34,11 +34,17 @@
        * dak/show_new.py: likewise
        * dak/split_done.py: likewise
        * dak/stats.py: likewise
+       * dak/transitions.py: likewise
 
        * dak/check_archive.py (check_files_not_symlinks): Remove
        long-time unused and commented code. Import stuff from daklib as
        "import daklib.foo as foo"
 
+2008-05-04  Thomas Viehmann  <tv@beamnet.de>
+
+       * dak/process_unchecked.py (check_signed_by_key): cater for uid_email
+       None in sponsor notification
+
 2008-05-03  Joerg Jaspert  <joerg@debian.org>
 
        * dak/examine_package.py: clean up pychecker warnings (merged with
@@ -64,6 +70,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>