Merge pull request #4061 from mind04/various

author Pieter Lexis <pieterlexis@users.noreply.github.com>

Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)

committer GitHub <noreply@github.com>

Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)
committer GitHub <noreply@github.com>
Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)
diff --cc modules/gmysqlbackend/gmysqlbackend.cc
Simple merge
diff --cc pdns/dnsname.hh
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)
committer	GitHub <noreply@github.com>
	Tue, 28 Jun 2016 15:27:00 +0000 (17:27 +0200)
		1	2
modules/gmysqlbackend/gmysqlbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsname.hh	patch \|	diff1 \|	diff2 \|	blob \| history