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

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

d6954119ab4b1916fceeaa2b0edbce90dab63a94