From: Dmitry Alenichev <mitya@vk.com>
Date: Tue, 29 Jan 2019 15:19:56 +0000 (+0300)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: auth-4.2.0-beta1~9^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=560e84e381168329e6901796097548f30aa5e006;p=thirdparty%2Fpdns.git

Merge remote-tracking branch 'upstream/master'
---

560e84e381168329e6901796097548f30aa5e006