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

author Peter van Dijk <peter.van.dijk@netherlabs.nl>

Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)

committer Peter van Dijk <peter.van.dijk@netherlabs.nl>

Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)
author Peter van Dijk <peter.van.dijk@netherlabs.nl>
Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)
committer Peter van Dijk <peter.van.dijk@netherlabs.nl>
Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)
diff --cc .travis.yml
Simple merge
diff --cc pdns/packethandler.cc

index 088d9e16b0f3329dda39a4681dfb2b9165dfa024,4e8230c2ad3e7819e212befcf47259b4342284be..b5ed6a2ad0759a162b5f50448cc1e10da240166e

mode 100755,100644..100755
--- 1/pdns/packethandler.cc
--- 2/pdns/packethandler.cc
+++ b/pdns/packethandler.cc
author	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)
committer	Peter van Dijk <peter.van.dijk@netherlabs.nl>
	Thu, 9 May 2013 13:43:58 +0000 (15:43 +0200)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/packethandler.cc	patch \|	diff1 \|	diff2 \|	blob \| history