Merge pull request #947 from mind04/right

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

Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)

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

Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)
author Peter van Dijk <peter@7bits.nl>
Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)
committer Peter van Dijk <peter@7bits.nl>
Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)
diff --cc pdns/rcpgenerator.cc
Simple merge
diff --cc pdns/unix_utility.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)
committer	Peter van Dijk <peter@7bits.nl>
	Thu, 15 Aug 2013 20:02:04 +0000 (13:02 -0700)
		1	2
pdns/rcpgenerator.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/unix_utility.cc	patch \|	diff1 \|	diff2 \|	blob \| history