From: Eugene Crosser <crosser@average.org>
Date: Sun, 20 Apr 2014 16:03:11 +0000 (+0400)
Subject: Merge branch 'master' of ssh://git.average.org/~/pdns-pipe-nmc
X-Git-Tag: 0.9.0.0~32
X-Git-Url: http://average.org/gitweb/?a=commitdiff_plain;h=ac3600bf0b71ef29110e644f79812a117a9480b2;p=pdns-pipe-nmc.git

Merge branch 'master' of ssh://git.average.org/~/pdns-pipe-nmc
---

ac3600bf0b71ef29110e644f79812a117a9480b2