From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 23 Apr 2014 05:54:24 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=44f00b9c823732598fb1a39e7cb844a1b3065dbd;p=thirdparty%2Fpdns.git

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

44f00b9c823732598fb1a39e7cb844a1b3065dbd