From: Marek Vavrusa <marek@vavrusa.com>
Date: Tue, 29 Mar 2016 05:09:34 +0000 (-0700)
Subject: Merge branch '1.0.0'
X-Git-Tag: v1.0.0~53
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3ade486eebe67de6c087568ab7bbf82c3d9ea6cc;p=thirdparty%2Fknot-resolver.git

Merge branch '1.0.0'
---

3ade486eebe67de6c087568ab7bbf82c3d9ea6cc