From: Marek Vavrusa <marek@vavrusa.com>
Date: Mon, 11 Jan 2016 04:31:39 +0000 (-0800)
Subject: Merge branch 'new-libknot'
X-Git-Tag: v1.0.0-beta3~22
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=f474ee264bce2380943ed0b5be7ac41140306a9a;p=thirdparty%2Fknot-resolver.git

Merge branch 'new-libknot'
---

f474ee264bce2380943ed0b5be7ac41140306a9a