Merge branch 'master' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 468f6047be368084e608cba47a42f90af32cd53b..8c7ce8a40ef2446994239b90591d884cc1e5b774 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -530,6 +530,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>