Merge pull request #3283 from pieterlexis/bye-bye-cryptopp

author Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)

committer Peter van Dijk <peter.van.dijk@powerdns.com>

Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)
committer Peter van Dijk <peter.van.dijk@powerdns.com>
Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)
diff --cc configure.ac
Simple merge
diff --cc pdns/Makefile.am
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)
committer	Peter van Dijk <peter.van.dijk@powerdns.com>
	Thu, 4 Feb 2016 14:08:34 +0000 (15:08 +0100)
		1	2
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history