Merge branch 'master' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 31085d640649ee71878fa746e66f7a157e4bbcd9..730146e4510bcb28832316ff358d002aa60110a5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -538,6 +538,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>