branch is closed

diff --git a/changelog b/changelog
index 656a79227462a5cd32efc595832d870351d89c88..1d9416086e9483fbddfbf90d5ad858d660da0a08 100644 (file)
--- a/changelog
+++ b/changelog
@@ -1,4 +1,12 @@
-adns (1.3); urgency=medium
+
+
+THIS BRANCH IS NOW CLOSED
+
+  EVERYTHING HAS BEEN MERGED TO THE TRUNK
+   (at CVS tag mergepoint-logcallbackfn)
+
+  DO NOT EDIT
+  

 
   * New adns_init_logfn etc. for having logging done with a callback
     function.
 
   * New adns_init_logfn etc. for having logging done with a callback
     function.