git.ipfire.org Git - thirdparty/pdns.git/commit

]> git.ipfire.org Git - thirdparty/pdns.git/commit

author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 16 Mar 2018 12:09:54 +0000 (13:09 +0100)
committer	Peter van Dijk <peter.van.dijk@powerdns.com>
	Fri, 16 Mar 2018 12:09:54 +0000 (13:09 +0100)
commit	2a177b99abd3a470b13c8252bdb3dc3f80658a2f
tree	5fef6c80e0533e3983aad9bc409987dcac59dae8	tree
parent	08a32a5dfb08f8543ecb37160be9ae87629faf2b	commit \| diff
parent	779da0145b5ed910546f6c462b2efd26ac0e4f52	commit \| diff

Merge 'master', but take geoipbackend from master as
it has diverged tremendously. Followup commits will
restore the geoip interface for LUA.

Unnamed repository; edit this file 'description' to name the repository.