]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'dnsname' of github.com:ahupowerdns/pdns into dnsname
authorbert hubert <bert.hubert@netherlabs.nl>
Sun, 29 Mar 2015 13:32:59 +0000 (15:32 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Sun, 29 Mar 2015 13:32:59 +0000 (15:32 +0200)
1  2 
pdns/dnsdist.cc

diff --cc pdns/dnsdist.cc
Simple merge