From: bert hubert <bert.hubert@netherlabs.nl>
Date: Fri, 28 Feb 2014 10:23:39 +0000 (+0100)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~156
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0cf823e69a9a09849389abea038c2a65a3cbe77f;p=thirdparty%2Fpdns.git

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

0cf823e69a9a09849389abea038c2a65a3cbe77f