]> granicus.if.org Git - pdns/commit
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 28 Oct 2015 20:38:39 +0000 (21:38 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 28 Oct 2015 20:38:39 +0000 (21:38 +0100)
commitc278ffdebc2d759e3fd33e12b7411a579ddab506
tree7ddbad733aa9e8172615e03281673b299dbdf826
parentb4b9a5307e2714184e2d42a283bef1175fc923c6
parent7da1c4afce6ccae03f41600f0ff6f06664e745f9
Merge branch 'master' of github.com:PowerDNS/pdns

Conflicts:
docs/markdown/appendix/backend-writers-guide.md
docs/markdown/appendix/backend-writers-guide.md