X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=adns.git;a=blobdiff_plain;f=changelog;h=1d9416086e9483fbddfbf90d5ad858d660da0a08;hp=656a79227462a5cd32efc595832d870351d89c88;hb=dd8fd887124e0f804663a70b6e5297d0c475f25a;hpb=4db1559fd37ee7d078383217228124cf365ef3a4

diff --git a/changelog b/changelog
index 656a792..1d94160 100644
--- 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.