]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'origin/master' into tsig-ixfr
authorbert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 09:41:52 +0000 (10:41 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Fri, 8 Jan 2016 09:41:52 +0000 (10:41 +0100)
commit8ce62cbbd5e84ee2dfcf668cca386f3dca285642
treeacd37cb524cdd08eae04efdaf7f1f14bcbae4aa1
parent0f5783890fd74eba7d1dcf422d2b3a8e83d833a5
parent88ca88957a47c8791bb14cacf4c7fcc0ff7d9b2a
Merge remote-tracking branch 'origin/master' into tsig-ixfr
pdns/resolver.cc