]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into dprotect
authorbert hubert <bert.hubert@powerdns.com>
Wed, 18 Nov 2015 10:58:11 +0000 (11:58 +0100)
committerbert hubert <bert.hubert@powerdns.com>
Wed, 18 Nov 2015 10:58:11 +0000 (11:58 +0100)
1  2 
pdns/Makefile.am

Simple merge