]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin' into lua-fixups 3134/head
authorbert hubert <bert.hubert@netherlabs.nl>
Wed, 30 Dec 2015 07:11:48 +0000 (07:11 +0000)
committerbert hubert <bert.hubert@netherlabs.nl>
Wed, 30 Dec 2015 07:11:48 +0000 (07:11 +0000)

Trivial merge