Merge branch 'master' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 3c68e7580e29a6451320ccbe0ab03bb5a34ad14d..a2e9ed6eeb0d5d2b754c119ccd0679a0db9fa998 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -557,6 +557,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>