]> granicus.if.org Git - pdns/commit
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)
commitf16cc650be3e1dc5144508c8f996bceaea741d57
treed4b40f385723edf29b2f9864edccc0f8fe3c9301
parent5cdfa87ce0d511eb5aa126c6d20a27c2a46e695b
parent6f3c79794ebdba77ee05f0c56eee77324b0ce0ee
Merge branch 'master' into master
docs/markdown/authoritative/dnssec.md
docs/markdown/httpapi/api_spec.md
pdns/pdnsutil.cc