Merge pull request #951 from cyclops1982/935

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

Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)

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

Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)
author Peter van Dijk <peter@7bits.nl>
Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)
committer Peter van Dijk <peter@7bits.nl>
Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/rec_channel.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)
committer	Peter van Dijk <peter@7bits.nl>
	Thu, 29 Aug 2013 09:55:41 +0000 (02:55 -0700)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec_channel.cc	patch \|	diff1 \|	diff2 \|	blob \| history