From: Eugene Crosser <crosser@average.org>
Date: Wed, 2 Apr 2014 07:52:28 +0000 (+0400)
Subject: less ugly (but still ugly) merge
X-Git-Tag: 0.9.0.0~98
X-Git-Url: http://www.average.org/gitweb/?p=pdns-pipe-nmc.git;a=commitdiff_plain;h=3677a8d0e1164eb4e7ba481a5e0d025fb1193005;hp=3677a8d0e1164eb4e7ba481a5e0d025fb1193005

less ugly (but still ugly) merge
---