Merge commit 'sec-merge' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index eead3da3bcfc0b541efd1535f06d6401b3c600c3..05a17bc50864a5aa85db676c170410d1a4895820 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -70,6 +70,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>