Merge pull request #1450 from mind04/lmdbsec

author Peter van Dijk <peter@7bits.nl>

Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)

committer Peter van Dijk <peter@7bits.nl>

Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)
author Peter van Dijk <peter@7bits.nl>
Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)
committer Peter van Dijk <peter@7bits.nl>
Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)
diff --cc .travis.yml
Simple merge
diff --cc configure.ac
Simple merge
diff --cc pdns/Makefile.am
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)
committer	Peter van Dijk <peter@7bits.nl>
	Thu, 3 Jul 2014 09:38:28 +0000 (11:38 +0200)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
configure.ac	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history