From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Fri, 27 Mar 2015 13:51:13 +0000 (+0100)
Subject: Merge branch 'lua'
X-Git-Tag: v1.0.0-beta1~278
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=954e0ee6b6d80910ca7c262c4b8e014c32bae366;p=thirdparty%2Fknot-resolver.git

Merge branch 'lua'
---

954e0ee6b6d80910ca7c262c4b8e014c32bae366