]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7c09656 4090c57)
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Jun 2015 11:06:58 +0000 (13:06 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Jun 2015 11:06:58 +0000 (13:06 +0200)
Conflicts:
docs/secpoll.zone


Trivial merge
Unnamed repository; edit this file 'description' to name the repository.