Merge commit 'sec-merge' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index d939879be2e1c0f3c4158646cfba128b6caad6b9..833a64bf860063d048d7f993c9938dbf58e8c3cf 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -19,6 +19,11 @@
        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
@@ -44,6 +49,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>