]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge remote-tracking branch 'origin/master' into 1.2
authorOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 09:44:50 +0000 (11:44 +0200)
committerOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 09:44:50 +0000 (11:44 +0200)
commit966c842d412d00e7d323eac0110a2dc60b7fa240
tree7655993259930e31655a2981553a209f93351b25
parent8327f0f941e712d0d2b5162828ce2e8218311171
parent80914f03c902bc13d10cec362fd7ff1d305cbdf1
Merge remote-tracking branch 'origin/master' into 1.2