Merge pull request #2907 from cmouse/geoipbackend-many-files

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

Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)

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

Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)
committer Peter van Dijk <peter.van.dijk@powerdns.com>
Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)
diff --cc .travis.yml
Simple merge
diff --cc pdns/misc.hh
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)
committer	Peter van Dijk <peter.van.dijk@powerdns.com>
	Sun, 22 Nov 2015 15:26:30 +0000 (16:26 +0100)
		1	2
.travis.yml	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/misc.hh	patch \|	diff1 \|	diff2 \|	blob \| history