From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 26 Jun 2013 18:48:02 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~624
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a52f3b3b607d479d2c583687942796e34fe91328;p=thirdparty%2Fpdns.git

Merge branch 'master' of github.com:PowerDNS/pdns
---

a52f3b3b607d479d2c583687942796e34fe91328