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

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

eb0a4b6d10a0cb2e33df1aeba2d5ba6ab70ece65