From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 26 Jun 2013 07:20:12 +0000 (+0200)
Subject: Merge branch 'dnsdist'
X-Git-Tag: rec-3.6.0-rc1~628
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=97cda2e8f2914169662cf337347527b6a4dfb517;p=pdns

Merge branch 'dnsdist'
---

97cda2e8f2914169662cf337347527b6a4dfb517