]> git.ipfire.org Git - thirdparty/knot-resolver.git/commitdiff
Merge branch 'release-1.2.2' into '1.2' v1.2.2
authorOndřej Surý <ondrej.sury@nic.cz>
Fri, 10 Feb 2017 12:28:19 +0000 (13:28 +0100)
committerOndřej Surý <ondrej.sury@nic.cz>
Fri, 10 Feb 2017 12:28:19 +0000 (13:28 +0100)
Release 1.2.2

See merge request !199


Trivial merge