]> 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 11:05:28 +0000 (13:05 +0200)
committerOndřej Surý <ondrej@sury.org>
Wed, 5 Apr 2017 11:05:28 +0000 (13:05 +0200)
commite98a0445469e97160dfa3e6f5931bd533b26660a
tree091d3568e7b8c62ca0431c3ebe83daf122b092bb
parentb00c5c55d323848fda70675f2e5efb91100e8040
parentaec68f05bc7ccde5c338e2cab30c14d29db540bf
Merge remote-tracking branch 'origin/master' into 1.2