tree 8d3d70c7e2d2f7ed18e594aaffed2f588e28a264
parent 687bac22dbae4c4f36f9021407d110336e7a3463
parent eec5c1e21c5e021e272162c9bccc61400bc1660a
author Simon Kelley <simon@thekelleys.org.uk> 1382703191 +0100
committer Simon Kelley <simon@thekelleys.org.uk> 1382703387 +0100

Merge branch 'master' into dnssec

Conflicts:
	src/dnsmasq.h
	src/forward.c
	src/option.c