]> granicus.if.org Git - pdns/commitdiff
Merge branch 'master' into master
authorPieter Lexis <pieterlexis@users.noreply.github.com>
Fri, 13 Jan 2017 14:36:05 +0000 (15:36 +0100)
committerGitHub <noreply@github.com>
Fri, 13 Jan 2017 14:36:05 +0000 (15:36 +0100)
1  2 
docs/markdown/authoritative/dnssec.md
docs/markdown/httpapi/api_spec.md
pdns/pdnsutil.cc

Simple merge
Simple merge
Simple merge