From: Matthias Fischer Date: Tue, 16 Jun 2015 19:40:16 +0000 (+0200) Subject: Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq X-Git-Tag: v2.17-core92~10^2~40^2~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=348334b6eb85aee6a4af46b907d19d6c45772ee6;p=ipfire-2.x.git Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq --- 348334b6eb85aee6a4af46b907d19d6c45772ee6 diff --cc src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch index de1e0e6ef5,b6d9c47cff..d50872bb36 --- a/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch +++ b/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch @@@ -25,5 -25,5 +25,4 @@@ index 592243fd4d35..74e5ab66c423 10064 /* If the answer is an error, keep the forward record in place in case -- - 1.7.10.4 - + 2.1.0 - diff --cc src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch index a0987679c8,84246c336a..0cf44932fc --- a/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch +++ b/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch @@@ -196,5 -196,5 +196,4 @@@ index 55526443dc84..a10e499ef768 10064 if (optno == OPTION_SNAME && done_server) -- - 1.7.10.4 - + 2.1.0 -