Oldstable byebye

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 31085d640649ee71878fa746e66f7a157e4bbcd9..2c3036feaeafe00aca11e99f07803c2d674a7b7b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2008-11-05  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/new_security_install.py (_do_Approve): This sudo call
+       definitely wants the -H option.
+
 2008-11-01  Joerg Jaspert  <joerg@debian.org>
 
        * dak/process_unchecked.py (check_files): Also check the
@@ -538,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>