]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' of github.com:PowerDNS/pdns into secpoll
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 22 Oct 2014 08:32:34 +0000 (10:32 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 22 Oct 2014 08:32:34 +0000 (10:32 +0200)
1  2 
pdns/pdns_recursor.cc

Simple merge