Generated with 2.4.4
Merge branch 'master' of github.com:adulau/pdns-qof
Merge branch 'master' of github.com:adulau/pdns-qof
Merge branch 'master' of github.com:adulau/pdns-qof

Conflicts:
	i-d/pdns-qof.txt
Merge branch 'master' of github.com:adulau/pdns-qof
Merge
Merge branch 'master' of github.com:adulau/pdns-qof

Conflicts:
	i-d/pdns-qof.txt
Merge branch 'master' of github.com:adulau/pdns-qof

Conflicts:
	i-d/pdns-qof.txt
Merge branch 'master' of github.com:adulau/pdns-qof

Conflicts:
	i-d/pdns-qof.txt
Draft draft-bortzmeyer-dnsop-dns-privacy reference added

As bibxml3 is missing the draft, it's still a comment.