]> granicus.if.org Git - pdns/commit
Merge branch 'master' of github.com:PowerDNS/pdns
authorbert hubert <bert.hubert@netherlabs.nl>
Sat, 21 Nov 2015 21:07:32 +0000 (22:07 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Sat, 21 Nov 2015 21:07:32 +0000 (22:07 +0100)
commita2aa00ed03085fac9fd6fc084b1f3b70cb5d1cc0
tree9d5c7a177ac24637c2b10cb1345f44743b91a3ce
parenta3af0e829adfebe9f31c0328c01c1c65222745cb
parent5e408970d6f37c0483f45d020f05650b484ceed1
Merge branch 'master' of github.com:PowerDNS/pdns

Conflicts:
pdns/dnsdist.hh
pdns/README-dnsdist.md
pdns/dnsdist-lua.cc
pdns/dnsdist.cc
pdns/dnsdist.hh