From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 15 Jul 2015 16:20:48 +0000 (+0200)
Subject: Merge commit '931d736540012dd8a770650434b3d901434930e3'
X-Git-Tag: v1.0.0-beta1~77
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92616842a923755e4096e4b05aefa4ddea7bc32b;p=thirdparty%2Fknot-resolver.git

Merge commit '931d736540012dd8a770650434b3d901434930e3'
---

92616842a923755e4096e4b05aefa4ddea7bc32b