Merge pull request #4291 from rgacogne/rec-protbuf-only-tagged

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

Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)

committer GitHub <noreply@github.com>

Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)
author Peter van Dijk <peter.van.dijk@powerdns.com>
Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)
committer GitHub <noreply@github.com>
Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/rec-lua-conf.cc
Simple merge
author	Peter van Dijk <peter.van.dijk@powerdns.com>
	Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)
committer	GitHub <noreply@github.com>
	Mon, 5 Sep 2016 08:19:30 +0000 (10:19 +0200)
		1	2
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/rec-lua-conf.cc	patch \|	diff1 \|	diff2 \|	blob \| history