From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Thu, 9 May 2013 13:43:58 +0000 (+0200)
Subject: Merge branch 'nsec3optout' of github.com:mind04/pdns into mind04-nsec3optout
X-Git-Tag: auth-3.3-rc1~94
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=04b4bf67d919181add802189f432af9c45d176ef;p=thirdparty%2Fpdns.git

Merge branch 'nsec3optout' of github.com:mind04/pdns into mind04-nsec3optout
---

04b4bf67d919181add802189f432af9c45d176ef
diff --cc pdns/packethandler.cc
index 088d9e16b0,4e8230c2ad..b5ed6a2ad0
mode 100755,100644..100755
--- a/pdns/packethandler.cc
+++ b/pdns/packethandler.cc