Merge remote-tracking branch 'origin/master' into dnsdist-to

author bert hubert <bert.hubert@powerdns.com>

Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)

committer bert hubert <bert.hubert@powerdns.com>

Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
author bert hubert <bert.hubert@powerdns.com>
Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
committer bert hubert <bert.hubert@powerdns.com>
Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
diff --cc pdns/README-dnsdist.md
Simple merge
diff --cc pdns/dnsdist-lua.cc
Simple merge
diff --cc pdns/dnsdist-lua2.cc
Simple merge
diff --cc pdns/dnsdist.hh
Simple merge
author	bert hubert <bert.hubert@powerdns.com>
	Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
committer	bert hubert <bert.hubert@powerdns.com>
	Mon, 4 Jan 2016 14:46:07 +0000 (15:46 +0100)
		1	2
pdns/README-dnsdist.md	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist-lua2.cc	patch \|	diff1 \|	diff2 \|	blob \| history
pdns/dnsdist.hh	patch \|	diff1 \|	diff2 \|	blob \| history