Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq
authorMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:40:16 +0000 (21:40 +0200)
committerMatthias Fischer <fischerm@ipfire.org>
Tue, 16 Jun 2015 19:40:16 +0000 (21:40 +0200)
1  2 
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.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
 -