]> git.ipfire.org Git - thirdparty/pdns.git/commit
Merge branch 'master' into alias
authorbert hubert <bert.hubert@netherlabs.nl>
Tue, 30 Sep 2014 11:56:23 +0000 (13:56 +0200)
committerbert hubert <bert.hubert@netherlabs.nl>
Tue, 30 Sep 2014 11:56:23 +0000 (13:56 +0200)
commit61fd0ca384b05e138554367dee2b2c025477201e
tree6d48e02fdd579999b81a83097eb75f5ba3dc91f0
parentd7aa389c865476e800c6cf2b48dcadbe220f54e7
parentf65da6d154b1442fcd92fa32585c49ba68d9a40f
Merge branch 'master' into alias

Conflicts:
pdns/dnsproxy.cc
pdns/dnsproxy.cc
pdns/packethandler.cc