]> git.ipfire.org Git - thirdparty/knot-resolver.git/commit
Merge branch '1.2-merge-master' into 'master'
authorOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:53:35 +0000 (11:53 +0200)
committerOndřej Surý <ondrej.sury@nic.cz>
Wed, 5 Apr 2017 09:53:35 +0000 (11:53 +0200)
commitd9215faec59739bc03e35f435b06d18015a27ee3
tree7655993259930e31655a2981553a209f93351b25
parent80914f03c902bc13d10cec362fd7ff1d305cbdf1
parent966c842d412d00e7d323eac0110a2dc60b7fa240
Merge branch '1.2-merge-master' into 'master'

1.2 merge master

Closes #158, #160, and #151

See merge request !257