Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq

diff --cc src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
index de1e0e6ef5dcb924ad49585e883a3e5b9b187d91,b6d9c47cff2b4678fb7a5be92d17daae3baa2e35..d50872bb360c2d297e2b05fbbe4de6303b90a65f
--- 1/src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
--- 2/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 a0987679c8e91e31ca24464e8c12afb3cb972b65,84246c336a4c8b6b6caa280bd2e9b208d26f1a0c..0cf44932fc87a7367da1b8fdeaefeede6db11452
--- 1/src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch
--- 2/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
 -