]> git.ipfire.org Git - thirdparty/pdns.git/commitdiff
Merge remote-tracking branch 'origin/master' into setbufsize 7311/head
authorOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 4 Jan 2019 11:02:35 +0000 (12:02 +0100)
committerOtto Moerbeek <otto.moerbeek@open-xchange.com>
Fri, 4 Jan 2019 11:02:35 +0000 (12:02 +0100)

Trivial merge