From: bert hubert <bert.hubert@netherlabs.nl>
Date: Thu, 27 Jun 2013 14:45:28 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0-rc1~617
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=03f228b56627edd5d6c0d572dbfed0ce576fa841;p=thirdparty%2Fpdns.git

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

03f228b56627edd5d6c0d572dbfed0ce576fa841