Merge pull request #5267 from cmouse/geoip-weights

author Peter van Dijk <peter.van.dijk@powerdns.com>

Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)

committer GitHub <noreply@github.com>

Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)
committer GitHub <noreply@github.com>
Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)
diff --cc modules/geoipbackend/geoipbackend.cc
Simple merge
diff --cc modules/geoipbackend/geoipbackend.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)
committer	GitHub <noreply@github.com>
	Tue, 25 Apr 2017 16:15:01 +0000 (18:15 +0200)
		1	2
modules/geoipbackend/geoipbackend.cc	patch \|	diff1 \|	diff2 \|	blob \| history
modules/geoipbackend/geoipbackend.hh	patch \|	diff1 \|	diff2 \|	blob \| history