]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
projects / thirdparty / pdns.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3b50c08 48b560e)
Merge branch 'ednssurg' of github.com:ahupowerdns/pdns into ednssurg
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 27 Sep 2015 17:44:43 +0000 (19:44 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 27 Sep 2015 17:44:43 +0000 (19:44 +0200)
Conflicts:
pdns/distributor.hh


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