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

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

cd39cd082fde5681f5dd4b2021a51fd15b7f8cff