]> granicus.if.org Git - pdns/commit
Merge remote-tracking branch 'main/master' into luaqa
authorbert hubert <bert.hubert@netherlabs.nl>
Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
committerbert hubert <bert.hubert@netherlabs.nl>
Mon, 26 Oct 2015 07:51:40 +0000 (08:51 +0100)
commit13fa75b587d820a70e94b759935995baa51bd334
treedbb72468e70073342e564047ac0f93d6eaaa5198
parent786d6f333cbd46c1ffe449c54d04067a8ba703b6
parent580b0b7db4e5d128ea510a8f1b2056f5ebd6ad9d
Merge remote-tracking branch 'main/master' into luaqa

Conflicts:
pdns/Makefile.am
pdns/Makefile.am
pdns/lua-pdns.cc
pdns/lua-recursor.cc
pdns/pdns_recursor.cc
pdns/syncres.cc