From: Marek Vavruša <marek.vavrusa@nic.cz>
Date: Wed, 29 Apr 2015 14:25:41 +0000 (+0200)
Subject: Merge branch 'events'
X-Git-Tag: v1.0.0-beta1~225
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6bdadb9ca4f7533c4861f44e47f488c055f857a5;p=thirdparty%2Fknot-resolver.git

Merge branch 'events'
---

6bdadb9ca4f7533c4861f44e47f488c055f857a5