From: Mark Andrews <marka@isc.org>
Date: Tue, 18 Dec 2012 23:35:45 +0000 (+1100)
Subject: Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9
X-Git-Tag: v9.10.0a1~652^2~1
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=32d24fef856a5938278abe502f02a66f4f608a05;p=thirdparty%2Fbind9.git

Merge branch 'master' of repo.isc.org:/proj/git/prod/bind9

Conflicts:
	CHANGES
---

32d24fef856a5938278abe502f02a66f4f608a05
diff --cc CHANGES
index 8ee1d0b76a4,3fcb25b2b3e..932f42f79cb
--- a/CHANGES
+++ b/CHANGES
@@@ -1,6 -1,6 +1,9 @@@
- 3443.	[bug]		The NOQNAME proof was not being returned from cached
++3444.	[bug]		The NOQNAME proof was not being returned from cached
 +			insecure responses. [RT #21409]
 +
+ 3443.	[bug]		ddns-confgen: Some TSIG algorithms were incorrectly
+ 			rejected when generating keys. [RT #31927]
+ 
  3442.	[port]		Net::DNS 0.69 introduced a non backwards compatible
  			change. [RT #32216]