From: Ondřej Surý <ondrej.sury@nic.cz>
Date: Wed, 5 Apr 2017 11:04:30 +0000 (+0200)
Subject: Merge branch 'travis-fix' into 'master'
X-Git-Tag: v1.2.6~12
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aec68f05bc7ccde5c338e2cab30c14d29db540bf;p=thirdparty%2Fknot-resolver.git

Merge branch 'travis-fix' into 'master'

Travis fix

See merge request !260
---

aec68f05bc7ccde5c338e2cab30c14d29db540bf