From: Marek Vavrusa <marek@vavrusa.com>
Date: Tue, 29 Mar 2016 05:09:29 +0000 (-0700)
Subject: Merge branch 'supervisor'
X-Git-Tag: v1.0.0~54
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=079a957bcdc79119b7981f297eff91ce199d8b5b;p=thirdparty%2Fknot-resolver.git

Merge branch 'supervisor'
---

079a957bcdc79119b7981f297eff91ce199d8b5b