christos efbc48848e Resolve conflicts

2004-11-07 00:16:59 +00:00

..

draft-baba-dnsext-acl-reqts-01.txt

…

draft-daigle-napstr-04.txt

…

draft-danisch-dns-rr-smtp-03.txt

…

draft-dnsext-opcode-discover-02.txt

…

draft-durand-dnsop-dynreverse-00.txt

…

draft-ietf-dnsext-axfr-clarify-05.txt

…

draft-ietf-dnsext-dhcid-rr-08.txt

…

draft-ietf-dnsext-dnssec-2535typecode-change-06.txt

…

draft-ietf-dnsext-dnssec-intro-11.txt

…

draft-ietf-dnsext-dnssec-protocol-07.txt

…

draft-ietf-dnsext-dnssec-records-09.txt

…

draft-ietf-dnsext-insensitive-04.txt

…

draft-ietf-dnsext-interop3597-01.txt

…

draft-ietf-dnsext-keyrr-key-signing-flag-12.txt

…

draft-ietf-dnsext-mdns-33.txt

…

draft-ietf-dnsext-tkey-renewal-mode-04.txt

…

draft-ietf-dnsext-tsig-sha-00.txt

…

draft-ietf-dnsext-wcard-clarify-02.txt

…

draft-ietf-dnsop-bad-dns-res-02.txt

…

draft-ietf-dnsop-dnssec-operational-practices-01.txt

…

draft-ietf-dnsop-ipv6-dns-configuration-02.txt

…

draft-ietf-dnsop-ipv6-dns-issues-09.txt

…

draft-ietf-dnsop-ipv6-transport-guidelines-01.txt

…

draft-ietf-dnsop-key-rollover-requirements-01.txt

…

draft-ietf-dnsop-misbehavior-against-aaaa-00.txt

…

draft-ietf-dnsop-respsize-01.txt

…

draft-ietf-dnsop-serverid-02.txt

…

draft-ietf-enum-e164-gstn-np-05.txt

…

draft-ietf-ipseckey-rr-09.txt

…

draft-ietf-ipv6-node-requirements-08.txt

…

draft-ietf-secsh-dns-05.txt

…

draft-ihren-dnsext-threshold-validation-00.txt

…

draft-kato-dnsop-local-zones-00.txt

…

draft-park-ipv6-extensions-dns-pnp-00.txt

…

update

…