Merge branch 'master' into dnssec

author Simon Kelley <simon@thekelleys.org.uk>

Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)

committer Simon Kelley <simon@thekelleys.org.uk>

Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
author Simon Kelley <simon@thekelleys.org.uk>
Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
committer Simon Kelley <simon@thekelleys.org.uk>
Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
diff --cc src/cache.c
Simple merge
diff --cc src/config.h
Simple merge
diff --cc src/dnsmasq.c
Simple merge
diff --cc src/dnsmasq.h
Simple merge
diff --cc src/forward.c
Simple merge
diff --cc src/option.c
Simple merge
author	Simon Kelley <simon@thekelleys.org.uk>
	Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
committer	Simon Kelley <simon@thekelleys.org.uk>
	Thu, 12 Dec 2013 12:16:17 +0000 (12:16 +0000)
		1	2
src/cache.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/config.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/dnsmasq.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/dnsmasq.h	patch \|	diff1 \|	diff2 \|	blob \| history
src/forward.c	patch \|	diff1 \|	diff2 \|	blob \| history
src/option.c	patch \|	diff1 \|	diff2 \|	blob \| history