merge in all Jeff Dairiki changes

rspamd · Apr 6, 2013 · 67f8c25 · 67f8c25
1 parent 915c398
commit 67f8c25
Showing 1 changed file with 4 additions and 0 deletions.
diff --git a/debian/changelog b/debian/changelog
@@ -1,5 +1,7 @@
 rbldnsd (0.996b+ipv6) unstable; urgency=low
 
+  [ Jeff Dairiki ]
+
   * configure: add --enable-asserts option to enable compilation of
     assertions; assertion checking is disabled by default
 
@@ -43,6 +45,8 @@ rbldnsd (0.996b+ipv6) unstable; urgency=low
 
   * mempool.c: bug fix for a theoretically possible buffer overrun
 
+  [ Michael Tokarev ]
+
   * feature: ip6tset - new dataset supports listing of ip6 /64 subnets and
     the exclusion of /128 subnets; only supports a single A/TXT value for
     the entire dataset