From: Vladimír Čunát <vladimir.cunat@nic.cz>
Date: Tue, 4 Apr 2017 17:36:20 +0000 (+0200)
Subject: Merge !255: fix travis, update libknot
X-Git-Tag: v1.2.5~5^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=961f6c54ee0dba4ac7d7a046a624cf24ed45a9e8;p=thirdparty%2Fknot-resolver.git

Merge !255: fix travis, update libknot
---

961f6c54ee0dba4ac7d7a046a624cf24ed45a9e8