]> git.ipfire.org Git - people/ms/dnsmasq.git/commit
Merge branch 'master' into dnssec
authorSimon Kelley <simon@thekelleys.org.uk>
Fri, 25 Oct 2013 12:13:11 +0000 (13:13 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Fri, 25 Oct 2013 12:16:27 +0000 (13:16 +0100)
commit5a4120dbfb2b44a55b5327daf7b3157a12416df7
tree8d3d70c7e2d2f7ed18e594aaffed2f588e28a264
parent687bac22dbae4c4f36f9021407d110336e7a3463
parenteec5c1e21c5e021e272162c9bccc61400bc1660a
Merge branch 'master' into dnssec

Conflicts:
src/dnsmasq.h
src/forward.c
src/option.c
Makefile
src/cache.c
src/config.h
src/dns-protocol.h
src/dnsmasq.c
src/dnsmasq.h
src/forward.c
src/option.c
src/rfc1035.c