Merge branch 'master' into prequery

author bert hubert <bert.hubert@netherlabs.nl>

Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)

committer bert hubert <bert.hubert@netherlabs.nl>

Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)
author bert hubert <bert.hubert@netherlabs.nl>
Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)
committer bert hubert <bert.hubert@netherlabs.nl>
Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)
diff --cc pdns/lua-recursor.cc
Simple merge
diff --cc pdns/pdns_recursor.cc
Simple merge
diff --cc pdns/powerdns-example-script.lua
Simple merge
diff --cc pdns/syncres.hh
Simple merge
author	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)
committer	bert hubert <bert.hubert@netherlabs.nl>
	Mon, 5 Jan 2015 12:26:59 +0000 (13:26 +0100)
		1	2
pdns/lua-recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/pdns_recursor.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/powerdns-example-script.lua	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/syncres.hh	patch \|	diff1 \|	diff2 \|	blob \| history