Merge pull request #5659 from Habbie/gettag-docs

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

Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)

committer GitHub <noreply@github.com>

Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)
author Pieter Lexis <pieterlexis@users.noreply.github.com>
Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)
committer GitHub <noreply@github.com>
Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)
diff --cc pdns/recursordist/docs/lua-scripting/hooks.rst
Simple merge
author	Pieter Lexis <pieterlexis@users.noreply.github.com>
	Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)
committer	GitHub <noreply@github.com>
	Thu, 14 Sep 2017 12:17:27 +0000 (14:17 +0200)