Merge branch 'master' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index a7c85ec4b4d1f4600ce52c5291df06940097aa11..2c3036feaeafe00aca11e99f07803c2d674a7b7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -543,6 +543,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>