From: Eugene Crosser <crosser@average.org>
Date: Sun, 20 Apr 2014 15:49:08 +0000 (+0400)
Subject: Merge branch 'conduit-free'
X-Git-Tag: 0.9.0.0~33
X-Git-Url: http://average.org/gitweb/?a=commitdiff_plain;h=3c383081597802c45ef5c6176c59d7d4880aea52;p=pdns-pipe-nmc.git

Merge branch 'conduit-free'
---

3c383081597802c45ef5c6176c59d7d4880aea52