]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into loggertemplate 7316/head
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 3 Jan 2019 12:00:37 +0000 (13:00 +0100)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Thu, 3 Jan 2019 12:00:37 +0000 (13:00 +0100)

Trivial merge