From: Marek Vavrusa Date: Wed, 6 Apr 2016 17:25:58 +0000 (-0700) Subject: Merge branch 'daemon-doc-typo' of https://github.com/thozza/knot-resolver into thozza... X-Git-Tag: v1.0.0~48^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0990c8740f877e4a79b063ae37acbeb63ed5b61d;p=thirdparty%2Fknot-resolver.git Merge branch 'daemon-doc-typo' of https://github.com/thozza/knot-resolver into thozza-daemon-doc-typo --- 0990c8740f877e4a79b063ae37acbeb63ed5b61d