From: Marek Vavrusa <marek@vavrusa.com>
Date: Thu, 21 Jan 2016 05:20:47 +0000 (-0800)
Subject: Merge branch 'deck_test'
X-Git-Tag: v1.0.0-beta3~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=caa82b82e7782801a7ed9023eb92d5f9e4ea9155;p=thirdparty%2Fknot-resolver.git

Merge branch 'deck_test'
---

caa82b82e7782801a7ed9023eb92d5f9e4ea9155