]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 8e14b23 d8c0cd8)
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 24 Apr 2015 08:16:21 +0000 (10:16 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 24 Apr 2015 08:16:21 +0000 (10:16 +0200)
Conflicts:
docs/secpoll.zone


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