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)
commit348334b6eb85aee6a4af46b907d19d6c45772ee6
treea35ce239a41b0192dfb2bf5154b0e79299cce172
parentbbe4537de3ef49c0d584896374876e5a3cdece75
parent5428eeeeaac1ecacbec2aecb9279cccd29e9c47d
Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into dnsmasq
src/patches/dnsmasq/0090-Tweak-EDNS-timeout-code.patch
src/patches/dnsmasq/0092-Allow-T1-and-T2-DHCPv4-options-to-be-set.patch