Forest root trust flags won't overwrite child trust flags

[ira/wip.git] / source3 / change-log

diff --git a/source3/change-log b/source3/change-log
index 0b8fabc0daf678092847c26c55406c8bce4e4141..1f7798b541f5b19851c873aab1af5394a857c47c 100644 (file)
--- a/source3/change-log
+++ b/source3/change-log
@@ -1,7 +1,8 @@
-Change Log for Samba
+SUPERCEDED Change Log for Samba
+^^^^^^^^^^
 
 Unless otherwise attributed, all changes were made by 
-Andrew.Tridgell@anu.edu.au
+Andrew.Tridgell@anu.edu.au. All bugs to samba-bugs@samba.org.
 
 NOTE: THIS LOG IS IN CHRONOLOGICAL ORDER