From: bert hubert <bert.hubert@netherlabs.nl>
Date: Sat, 29 Aug 2015 11:26:33 +0000 (+0200)
Subject: Merge branch 'master' of github.com:PowerDNS/pdns
X-Git-Tag: dnsdist-1.0.0-alpha1~248^2~76
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e85fa0eaf13feefee839c2ae198cc0baa6207e6a;p=pdns

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

e85fa0eaf13feefee839c2ae198cc0baa6207e6a