Merge pull request #1389 from paddg/help_is_not_an_error

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

Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)

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

Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)
author Peter van Dijk <peter@7bits.nl>
Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)
committer Peter van Dijk <peter@7bits.nl>
Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/zone2sql.cc
Simple merge
author	Peter van Dijk <peter@7bits.nl>
	Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)
committer	Peter van Dijk <peter@7bits.nl>
	Tue, 29 Apr 2014 10:55:39 +0000 (12:55 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/zone2sql.cc	patch \|	diff1 \|	diff2 \|	blob \| history