]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'delaypipe' of github.com:ahupowerdns/pdns into delaypipe 2574/head
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Jun 2015 11:15:39 +0000 (13:15 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 9 Jun 2015 11:15:39 +0000 (13:15 +0200)

Trivial merge