]> git.ipfire.org Git - people/ms/dnsmasq.git/commit - src/dnsmasq.h
Merge branch 'edns0'
authorSimon Kelley <simon@thekelleys.org.uk>
Fri, 11 Oct 2013 09:25:56 +0000 (10:25 +0100)
committerSimon Kelley <simon@thekelleys.org.uk>
Fri, 11 Oct 2013 09:25:56 +0000 (10:25 +0100)
commit6bd3a09fb8683bf2693051f2693f2d332405ec0b
treed2101cc70bfc1f287ba1b173ed5b35534acd5738
parent8584c502d37627d8abe18213771b5f4f98cb4aa3
parentf65b0e546b96d0499448b04500ef63f664450fe4
Merge branch 'edns0'

Conflicts:
CHANGELOG
src/dnsmasq.h
src/option.c
CHANGELOG
man/dnsmasq.8
src/dnsmasq.h
src/option.c