]> 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 12:30:01 +0000 (14:30 +0200)
committerOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 12:30:01 +0000 (14:30 +0200)
commit57d5b1f1f62d596c3ca26f8357dda99d601433c2
treed56223d6435ff447b4574052271ff3a86a8ee0a8
parent9f25542e3c54172382271ad444d7541dbea69482
parent1590015c253006be11ae762842635027da1e0a41
Merge remote-tracking branch 'origin/master' into 1.2