From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 22 Oct 2014 08:32:34 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns into secpoll
X-Git-Tag: rec-3.7.0-rc1~199
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=195caa7a67c148383782126ff2eb2129a0ec64fc;p=thirdparty%2Fpdns.git

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

195caa7a67c148383782126ff2eb2129a0ec64fc