From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Thu, 19 Nov 2015 18:22:11 +0000 (+0100)
Subject: Merge branch 'deckard'
X-Git-Tag: v1.0.0-beta2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b20aa27ef36a79e33e9998078b6b00a4a7af99da;p=thirdparty%2Fknot-resolver.git

Merge branch 'deckard'
---

b20aa27ef36a79e33e9998078b6b00a4a7af99da