]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into tsig-ixfr 3190/head
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)
1  2 
pdns/resolver.cc

Simple merge