From: bert hubert <bert.hubert@netherlabs.nl>
Date: Wed, 4 Jun 2014 18:24:25 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: rec-3.6.0~19
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a350a72506550957ad31a8ee24cffe3e416261f2;p=thirdparty%2Fpdns.git

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

a350a72506550957ad31a8ee24cffe3e416261f2