]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge branch 'master' into luaqa
authorbert hubert <bert.hubert@netherlabs.nl>
Sat, 31 Oct 2015 18:51:04 +0000 (19:51 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Sat, 31 Oct 2015 18:51:04 +0000 (19:51 +0100)
1  2 
pdns/Makefile.am

Simple merge